X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=3175e9875046f3a405bec1e9d4718be70377c4e0;hb=f0d3e4d3003954a9745a4c71665185e24565618f;hp=0710fb3778d6b78523423ca73fedf1d79da57a22;hpb=a10e74dc4717c2cc80d30f213c2be08e7cfb7ac4;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index 0710fb37..3175e987 100644 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -42,6 +42,7 @@ import re import email as modemail import subprocess import ldap +import errno import daklib.config as config import daklib.daksubprocess @@ -358,7 +359,7 @@ def check_size(where, files): try: entry = os.stat(f) except OSError as exc: - if exc.errno == 2: + if exc.errno == errno.ENOENT: # TODO: This happens when the file is in the pool. continue raise @@ -1566,7 +1567,7 @@ def parse_wnpp_bug_file(file = "/srv/ftp-master.debian.org/scripts/masterfiles/w lines = f.readlines() except IOError as e: print "Warning: Couldn't open %s; don't know about WNPP bugs, so won't close any." % file - lines = [] + lines = [] wnpp = {} for line in lines: @@ -1834,9 +1835,10 @@ def check_reverse_depends(removals, suite, arches=None, session=None, cruft=Fals .filter(Override.package == re.sub('/(contrib|non-free)$', '', source)) \ .join(Override.overridetype).filter(OverrideType.overridetype == 'dsc') \ .first() + key = source if component != "main": - source = "%s/%s" % (source, component) - all_broken.setdefault(source, set()).add(pp_deps(dep)) + key = "%s/%s" % (source, component) + all_broken.setdefault(key, set()).add(pp_deps(dep)) dep_problem = 1 if all_broken: