Author: marius
Date: Mon Feb  1 22:16:41 2016
New Revision: 295130
URL: https://svnweb.freebsd.org/changeset/base/295130

Log:
  MFC: r295032
  
  Use '^[>+][^+]' instead of '^[>+]' with grep(1) when filtering the
  diff(1) output between two files in "new_only"-mode. Otherwise,
  with the default of using unified format a remnant of the header
  in the output is the result. This is especially irritating when
  the two files differ but the second one is empty, amounting to the
  vestige of the header being the only readout.
  Reported by: Stefan Haemmerl
  
  Approved by:  re (delphij)

Modified:
  stable/10/etc/periodic/security/security.functions
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/periodic/security/security.functions
==============================================================================
--- stable/10/etc/periodic/security/security.functions  Mon Feb  1 19:43:04 
2016        (r295129)
+++ stable/10/etc/periodic/security/security.functions  Mon Feb  1 22:16:41 
2016        (r295130)
@@ -51,7 +51,7 @@ check_diff() {
   rc=0
   if [ "$1" = "new_only" ]; then
     shift
-    filter="grep '^[>+]'"
+    filter="grep '^[>+][^+]'"
   else
     filter="cat"
   fi
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to