X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=96a01ec4e04666070142aaab8a707e5a5d6e9684;hb=159be8fa02c62b9a9114c78edddc0913df21d636;hp=fbe3b1a025c55ecaaeb2d881c81a708987154a9e;hpb=1eeb90f6bf381e10fcd8f0a04437883b443855d5;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py old mode 100755 new mode 100644 index fbe3b1a0..96a01ec4 --- 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 @@ -258,9 +259,8 @@ def parse_changes(filename, signing_rules=0, dsc_file=0, keyrings=None): "-----BEGIN PGP SIGNATURE-----". """ - changes_in = open_file(filename) - content = changes_in.read() - changes_in.close() + with open_file(filename) as changes_in: + content = changes_in.read() try: unicode(content, 'utf-8') except UnicodeError: @@ -321,11 +321,8 @@ def check_hash(where, files, hashname, hashfunc): rejmsg = [] for f in files.keys(): - file_handle = None try: - try: - file_handle = open_file(f) - + with open_file(f) as file_handle: # Check for the hash entry, to not trigger a KeyError. if not files[f].has_key(hash_key(hashname)): rejmsg.append("%s: misses %s checksum in %s" % (f, hashname, @@ -336,13 +333,10 @@ def check_hash(where, files, hashname, hashfunc): if hashfunc(file_handle) != files[f][hash_key(hashname)]: rejmsg.append("%s: %s check failed in %s" % (f, hashname, where)) - except CantOpenError: - # TODO: This happens when the file is in the pool. - # warn("Cannot open file %s" % f) - continue - finally: - if file_handle: - file_handle.close() + except CantOpenError: + # TODO: This happens when the file is in the pool. + # warn("Cannot open file %s" % f) + continue return rejmsg ################################################################################ @@ -358,7 +352,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 @@ -619,9 +613,8 @@ def send_mail (message, filename="", whitelists=None): if maildir: path = os.path.join(maildir, datetime.datetime.now().isoformat()) path = find_next_free(path) - fh = open(path, 'w') - print >>fh, message, - fh.close() + with open(path, 'w') as fh: + print >>fh, message, # Check whether we're supposed to be sending mail if Cnf.has_key("Dinstall::Options::No-Mail") and Cnf["Dinstall::Options::No-Mail"]: @@ -638,9 +631,8 @@ def send_mail (message, filename="", whitelists=None): if Cnf.get('Dinstall::MailWhiteList', ''): whitelists.append(Cnf['Dinstall::MailWhiteList']) if len(whitelists) != 0: - message_in = open_file(filename) - message_raw = modemail.message_from_file(message_in) - message_in.close(); + with open_file(filename) as message_in: + message_raw = modemail.message_from_file(message_in) whitelist = []; for path in whitelists: @@ -720,7 +712,7 @@ def move (src, dest, overwrite = 0, perms = 0o664): dest_dir = dest else: dest_dir = os.path.dirname(dest) - if not os.path.exists(dest_dir): + if not os.path.lexists(dest_dir): umask = os.umask(00000) os.makedirs(dest_dir, 0o2775) os.umask(umask) @@ -728,7 +720,7 @@ def move (src, dest, overwrite = 0, perms = 0o664): if os.path.exists(dest) and os.path.isdir(dest): dest += '/' + os.path.basename(src) # Don't overwrite unless forced to - if os.path.exists(dest): + if os.path.lexists(dest): if not overwrite: fubar("Can't move %s to %s - file already exists." % (src, dest)) else: @@ -751,7 +743,7 @@ def copy (src, dest, overwrite = 0, perms = 0o664): if os.path.exists(dest) and os.path.isdir(dest): dest += '/' + os.path.basename(src) # Don't overwrite unless forced to - if os.path.exists(dest): + if os.path.lexists(dest): if not overwrite: raise FileExistsError else: @@ -762,14 +754,6 @@ def copy (src, dest, overwrite = 0, perms = 0o664): ################################################################################ -def where_am_i (): - res = socket.getfqdn() - database_hostname = Cnf.get("Config::" + res + "::DatabaseHostname") - if database_hostname: - return database_hostname - else: - return res - def which_conf_file (): if os.getenv('DAK_CONFIG'): return os.getenv('DAK_CONFIG') @@ -789,23 +773,14 @@ def which_conf_file (): return default_config -def which_alias_file(): - hostname = socket.getfqdn() - aliasfn = '/var/lib/misc/'+hostname+'/forward-alias' - if os.path.exists(aliasfn): - return aliasfn - else: - return None - ################################################################################ def TemplateSubst(subst_map, filename): """ Perform a substition of template """ - templatefile = open_file(filename) - template = templatefile.read() + with open_file(filename) as templatefile: + template = templatefile.read() for k, v in subst_map.iteritems(): template = template.replace(k, str(v)) - templatefile.close() return template ################################################################################ @@ -894,7 +869,7 @@ def changes_compare (a, b): def find_next_free (dest, too_many=100): extra = 0 orig_dest = dest - while os.path.exists(dest) and extra < too_many: + while os.path.lexists(dest) and extra < too_many: dest = orig_dest + '.' + repr(extra) extra += 1 if extra >= too_many: @@ -1582,7 +1557,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: @@ -1850,9 +1825,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: