X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_suite_file_list.py;h=8c13100998eb6b651d86358e720e654eb73dbc8d;hb=2df1ebdd5dc4423d8425311c0de28d5adfbc9fa8;hp=3c690a510960b42da5e9d8a36a4d9952bc7c5a84;hpb=35715aaa09f686b79725a759c3f38b2411198cda;p=dak.git diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py index 3c690a51..8c131009 100755 --- a/dak/make_suite_file_list.py +++ b/dak/make_suite_file_list.py @@ -54,10 +54,6 @@ Options = None #: Parsed CommandLine arguments ################################################################################ -def Dict(**dict): return dict - -################################################################################ - def usage (exit_code=0): print """Usage: dak make-suite-file-list [OPTION] Write out file lists suitable for use with apt-ftparchive. @@ -309,6 +305,8 @@ def write_filelists(packages, dislocated_files, session): ################################################################################ def do_da_do_da(): + cnf = Config() + # If we're only doing a subset of suites, ensure we do enough to # be able to do arch: all mapping. if Options["Suite"]: @@ -357,13 +355,15 @@ SELECT s.id, s.source, 'source', s.version, l.path, f.filename, c.name, f.id, # 'id' comes from either 'binaries' or 'source', so it's not unique unique_id += 1 - packages[unique_id] = Dict(sourceid=sourceid, pkg=pkg, arch=arch, version=version, + packages[unique_id] = dict(sourceid=sourceid, pkg=pkg, arch=arch, version=version, path=path, filename=filename, component=component, file_id=file_id, suite=suite, filetype = filetype) cleanup(packages, session) session.commit() - write_filelists(packages, dislocated_files, session) + + # has been replaced by 'dak generate-filelist': + #write_filelists(packages, dislocated_files, session) ################################################################################