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

[Brian Murray]

Details in the bug report.

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-24 15:17:07 +0000
+++ debian/changelog	2012-09-20 22:34:19 +0000
@@ -1,3 +1,10 @@
+squid-deb-proxy (0.6.6) UNRELEASED; urgency=low
+
+  * remove the autogenerated blacklist file if it contains no data
+    (LP: #1053682)
+
+ -- Brian Murray <[e-mail]>  Thu, 20 Sep 2012 15:28:54 -0700
+
 squid-deb-proxy (0.6.5) quantal; urgency=low
 
   [ Simon Déziel ]

=== modified file 'debian/squid-deb-proxy.upstart'
--- debian/squid-deb-proxy.upstart	2012-07-05 13:40:13 +0000
+++ debian/squid-deb-proxy.upstart	2012-09-20 22:34:19 +0000
@@ -49,6 +49,10 @@
   concat_file_from_dir "$PKG_BLACKLIST_DIR" "$PKG_BLACKLIST"
   # postprocess for regexp format
   sed -i -r '/^#/d;/^$/d;s#(.*)#\/\1_.*\.deb$#g' $PKG_BLACKLIST
+  # if the file is empty remove it
+  if [ ! -s $PKG_BLACKLIST ]; then
+    rm $PKG_BLACKLIST
+  fi
 
   # generate mirror file
   MIRROR_DESTDOMAIN_DIR=/etc/squid-deb-proxy/mirror-dstdomain.acl.d