------------------------------------------------------------ revno: 13527 revision-id: squid3@treenet.co.nz-20140808115258-xazeqbpcs71bw8hh parent: squid3@treenet.co.nz-20140802140321-6x1039iqnpbtoive fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=4093 author: Alex Rousskov committer: Amos Jeffries branch nick: trunk timestamp: Fri 2014-08-08 05:52:58 -0600 message: Bug 4093: source-maintenance.sh bad perl -i option ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140808115258-xazeqbpcs71bw8hh # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: db35c51d1f5ab6f3c166f6aa055a342756129376 # timestamp: 2014-08-08 11:54:06 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140802140321-\ # 6x1039iqnpbtoive # # Begin patch === modified file 'scripts/source-maintenance.sh' --- scripts/source-maintenance.sh 2014-02-08 13:36:42 +0000 +++ scripts/source-maintenance.sh 2014-08-08 11:52:58 +0000 @@ -139,7 +139,7 @@ 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} ;;