------------------------------------------------------------
revno: 12685
revision-id: squid3@treenet.co.nz-20141031013814-35bgrhawvnhje0xq
parent: squidadm@squid-cache.org-20141008153139-xgkckhv8l27pp272
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4093
author: Alex Rousskov <rousskov@measurement-factory.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Thu 2014-10-30 18:38:14 -0700
message:
  Bug 4093: source-maintenance.sh errors and warnings due to wrong tools/options
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20141031013814-35bgrhawvnhje0xq
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 509a90e1379ddcf52b086c8cb03e41ec870ba7b3
# timestamp: 2014-10-31 01:39:23 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squidadm@squid-cache.org-20141008153139-\
#   xgkckhv8l27pp272
# 
# Begin patch
=== modified file 'scripts/source-maintenance.sh'
--- scripts/source-maintenance.sh	2012-08-14 11:53:07 +0000
+++ scripts/source-maintenance.sh	2014-10-31 01:38:14 +0000
@@ -37,12 +37,14 @@
 #
 # Scan for incorrect use of #ifdef/#ifndef
 #
-grep -E "ifn?def .*_SQUID_" ./* | grep -v -E "_H$" | while read f; do echo "PROBLEM?: ${PWD} ${f}"; done
+bzr grep --no-recursive "ifn?def .*_SQUID_" |
+    grep -v -E "_H$" |
+    while read f; do echo "PROBLEM?: ${PWD} ${f}"; done
 
 #
 # Scan for file-specific actions
 #
-for FILENAME in `ls -1`; do
+for FILENAME in `bzr ls --versioned`; do
 
     case ${FILENAME} in
 
@@ -105,13 +107,13 @@
 
     Makefile.am)
 
-    	perl -i -p -e 's/@([A-Z0-9_]+)@/\$($1)/g' <${FILENAME} >${FILENAME}.styled
+    	perl -p -e 's/@([A-Z0-9_]+)@/\$($1)/g' <${FILENAME} >${FILENAME}.styled
 	mv ${FILENAME}.styled ${FILENAME}
 	;;
 
     esac
 
-    if test "$FILENAME" = "libltdl" -o "$FILENAME" = "libTrie" ; then
+    if test "$FILENAME" = "libltdl/" -o "$FILENAME" = "libTrie/" ; then
         :
     elif test -d $FILENAME ; then
 	cd $FILENAME