------------------------------------------------------------ revno: 13676 revision-id: squid3@treenet.co.nz-20141208082930-ly0aovw3hjd5z78y parent: squid3@treenet.co.nz-20141208082431-39r8domcsp57vg7h committer: Amos Jeffries branch nick: 3.5 timestamp: Mon 2014-12-08 00:29:30 -0800 message: Fix bootstrap.sh dependency on SPONSORS.list bootstrap.sh is distributed in tarballs and may be used by packagers for various reasons. It does not need to unconditionally replace SPONSORS. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20141208082930-ly0aovw3hjd5z78y # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 9bd45d7e2dff9d3bedb34aff6d1bb7f8b4c79d04 # timestamp: 2014-12-08 08:51:07 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20141208082431-\ # 39r8domcsp57vg7h # # Begin patch === modified file 'bootstrap.sh' --- bootstrap.sh 2014-09-13 15:04:00 +0000 +++ bootstrap.sh 2014-12-08 08:29:30 +0000 @@ -164,7 +164,9 @@ done # Make a copy of SPONSORS we can package -sed -e 's/@Squid-[0-9\.]*://' SPONSORS || (rm -f SPONSORS && exit 1) +if test -f SPONSORS.list; then + sed -e 's/@Squid-[0-9\.]*://' SPONSORS || (rm -f SPONSORS && exit 1) +fi # Fixup autoconf recursion using --silent/--quiet option # autoconf should inherit this option whe recursing into subdirectories