X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fmake_suite_file_list.py;h=87dfbdf9cb7a66e36aa1424fc40958a2cc1c9bc0;hb=cdba2646d1dea91d419e75128070d9526cd73b04;hp=dbbab7ec4712bcc3eacfe28ee55e2dadd99a0d91;hpb=cdffcfe2a0e6804ed35df56c4c2aa084c2b63677;p=dak.git diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py index dbbab7ec..87dfbdf9 100755 --- a/dak/make_suite_file_list.py +++ b/dak/make_suite_file_list.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Generate file lists used by apt-ftparchive to generate Packages and Sources files +""" Generate file lists used by apt-ftparchive to generate Packages and Sources files """ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006 James Troup # This program is free software; you can redistribute it and/or modify @@ -82,7 +82,7 @@ def delete_packages(delete_versions, pkg, dominant_arch, suite, if not packages.has_key(delete_unique_id): continue delete_version = version[0] - delete_id = packages[delete_unique_id]["id"] + delete_id = packages[delete_unique_id]["sourceid"] delete_arch = packages[delete_unique_id]["arch"] if not Cnf.Find("Suite::%s::Untouchable" % (suite)) or Options["Force"]: if Options["No-Delete"]: @@ -264,7 +264,7 @@ def write_filelists(packages, dislocated_files): suite = packages[unique_id]["suite"] component = packages[unique_id]["component"] arch = packages[unique_id]["arch"] - packagetype = packages[unique_id]["type"] + packagetype = packages[unique_id]["filetype"] d.setdefault(suite, {}) d[suite].setdefault(component, {}) d[suite][component].setdefault(arch, {})