Merge remote branch 'tolimar/rm-close-bugs' into merge

* tolimar/rm-close-bugs:
  make wnpp file world readable and do so before moving it
  Fix spelling of "IOError" so we indeed don't raise an exception
  Make that file readable by ftpteam

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 16d9d9d10d1c641e7759309044fe1f402d643b7a..4324a8fe290ad9cebb354895ebce532fa98b19bb 100755 (executable)
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -20,6 +20,7 @@ trap cleanup SIGHUP SIGINT SIGPIPE SIGTERM EXIT ERR
 
 # get the latest list of wnpp bugs and their source packages
 wget -q -O${TMPFILE} http://qa.debian.org/data/bts/wnpp_rm
+chmod go+r ${TMPFILE}
 mv ${TMPFILE} /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm
 
 ################################################################################

diff --git a/daklib/utils.py b/daklib/utils.py
index 7ed4089a4dd2610a09a7c5f7a3852eda987b5456..1756f58fa2d27132a3675a95716ab4404cf9a898 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -1553,7 +1553,7 @@ def parse_wnpp_bug_file(file = "/srv/ftp-master.debian.org/scripts/masterfiles/w
     try:
         f = open(file)
         lines = f.readlines()
-    except IOerror, e:
+    except IOError, e:
         print "Warning:  Couldn't open %s; don't know about WNPP bugs, so won't close any." % file
        lines = []
     wnpp = {}