Author: marius
Date: Fri Jan 29 01:54:32 2016
New Revision: 295032
URL: https://svnweb.freebsd.org/changeset/base/295032

Log:
  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
  
  MFC after:    3 days

Modified:
  head/etc/periodic/security/security.functions

Modified: head/etc/periodic/security/security.functions
==============================================================================
--- head/etc/periodic/security/security.functions       Fri Jan 29 01:22:12 
2016        (r295031)
+++ head/etc/periodic/security/security.functions       Fri Jan 29 01:54:32 
2016        (r295032)
@@ -51,7 +51,7 @@ check_diff() {
   rc=0
   if [ "$1" = "new_only" ]; then
     shift
-    filter="grep '^[>+]'"
+    filter="grep '^[>+][^+]'"
   else
     filter="cat"
   fi
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to