------------------------------------------------------------
revno: 13195
revision-id: squid3@treenet.co.nz-20141208120722-d18th9o9244nuruz
parent: squid3@treenet.co.nz-20141208120517-tbgzags6g5ddq0qs
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Mon 2014-12-08 04:07:22 -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-20141208120722-d18th9o9244nuruz
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: 2b75a2f4d371075ec8efcaf605f120962d4f5db3
# timestamp: 2014-12-08 12:08:47 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20141208120517-\
#   tbgzags6g5ddq0qs
# 
# Begin patch
=== modified file 'bootstrap.sh'
--- bootstrap.sh	2013-06-11 13:13:23 +0000
+++ bootstrap.sh	2014-12-08 12:07:22 +0000
@@ -156,7 +156,9 @@
 done
 
 # Make a copy of SPONSORS we can package
-sed -e 's/@Squid-[0-9\.]*://' <SPONSORS.list > SPONSORS || (rm -f SPONSORS && exit 1)
+if test -f SPONSORS.list; then
+  sed -e 's/@Squid-[0-9\.]*://' <SPONSORS.list > SPONSORS || (rm -f SPONSORS && exit 1)
+fi
 
 # Fixup autoconf recursion using --silent/--quiet option
 # autoconf should inherit this option whe recursing into subdirectories