X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=38a987faf701f7e73d0f5a905e915b5f7858c9c8;hb=0873d6309f8352ffd4331ec373b10dc737b4dfb3;hp=5e702b04d51a182cd3ee5f82ff8c2d1b5edf4cb0;hpb=f4a53b256d1295d471569af5d66401401cf78cc8;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index 5e702b04..38a987fa 100755 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -526,8 +526,7 @@ def parse_checksums(where, files, manifest, hashname): files[checkfile][hash_key(hashname)] = checksum for f in files.keys(): if not files[f].has_key(hash_key(hashname)): - rejmsg.append("%s: no entry in checksums-%s in %s" % (checkfile, - hashname, where)) + rejmsg.append("%s: no entry in checksums-%s in %s" % (f, hashname, where)) return rejmsg ################################################################################ @@ -766,7 +765,7 @@ def which_conf_file (): homedir = os.getenv("HOME") confpath = os.path.join(homedir, "/etc/dak.conf") if os.path.exists(confpath): - apt_pkg.ReadConfigFileISC(Cnf,default_config) + apt_pkg.ReadConfigFileISC(Cnf,confpath) # We are still in here, so there is no local config file or we do # not allow local files. Do the normal stuff.