Merge lp:~brian-murray/squid-deb-proxy/remove-empty-blacklist into lp:squid-deb-proxy

Proposed by Brian Murray
Status: Merged
Merged at revision: 71
Proposed branch: lp:~brian-murray/squid-deb-proxy/remove-empty-blacklist
Merge into: lp:squid-deb-proxy
Diff against target: 29 lines (+11/-0)
2 files modified
debian/changelog (+7/-0)
debian/squid-deb-proxy.upstart (+4/-0)
To merge this branch: bzr merge lp:~brian-murray/squid-deb-proxy/remove-empty-blacklist
Reviewer Review Type Date Requested Status
squid-deb-proxy-developers Pending
Review via email: mp+125595@code.launchpad.net

Description of the change

Details in the bug report.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-08-24 15:17:07 +0000
3+++ debian/changelog 2012-09-20 22:34:19 +0000
4@@ -1,3 +1,10 @@
5+squid-deb-proxy (0.6.6) UNRELEASED; urgency=low
6+
7+ * remove the autogenerated blacklist file if it contains no data
8+ (LP: #1053682)
9+
10+ -- Brian Murray <brian@ubuntu.com> Thu, 20 Sep 2012 15:28:54 -0700
11+
12 squid-deb-proxy (0.6.5) quantal; urgency=low
13
14 [ Simon D├ęziel ]
15
16=== modified file 'debian/squid-deb-proxy.upstart'
17--- debian/squid-deb-proxy.upstart 2012-07-05 13:40:13 +0000
18+++ debian/squid-deb-proxy.upstart 2012-09-20 22:34:19 +0000
19@@ -49,6 +49,10 @@
20 concat_file_from_dir "$PKG_BLACKLIST_DIR" "$PKG_BLACKLIST"
21 # postprocess for regexp format
22 sed -i -r '/^#/d;/^$/d;s#(.*)#\/\1_.*\.deb$#g' $PKG_BLACKLIST
23+ # if the file is empty remove it
24+ if [ ! -s $PKG_BLACKLIST ]; then
25+ rm $PKG_BLACKLIST
26+ fi
27
28 # generate mirror file
29 MIRROR_DESTDOMAIN_DIR=/etc/squid-deb-proxy/mirror-dstdomain.acl.d

Subscribers

People subscribed via source and target branches

to all changes: