X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_suite_file_list.py;h=a63a617d278652c73ee270bab2271847b1dcc5a9;hb=06b17e68fd4a76e7a12f741f26654e55bff05c79;hp=9836560d7e88940a5732c99cabc81484bf619784;hpb=30662a0d8af5ab5873ff7bdd7d59de52c1ce7fb5;p=dak.git diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py old mode 100755 new mode 100644 index 9836560d..a63a617d --- a/dak/make_suite_file_list.py +++ b/dak/make_suite_file_list.py @@ -85,7 +85,7 @@ def delete_packages(delete_versions, pkg, dominant_arch, suite, delete_version = version[0] delete_id = packages[delete_unique_id]["id"] delete_arch = packages[delete_unique_id]["arch"] - if not Cnf.Find("Suite::%s::Untouchable" % (suite)) or Options["Force"]: + if not Cnf.Find("Suite::%s::Untouchable" % (suite)) or Options["Force"]: if Options["No-Delete"]: print "Would delete %s_%s_%s in %s in favour of %s_%s" % (pkg, delete_arch, delete_version, suite, dominant_version, dominant_arch) else: @@ -363,7 +363,7 @@ def do_da_do_da(): daklib.utils.warn("Adding %s as %s maps Arch: all from it." % (archall_suite, suite)) suites.append(archall_suite) Options["Suite"] = ",".join(suites) - + (con_suites, con_architectures, con_components, check_source) = \ daklib.utils.parse_args(Options) @@ -414,11 +414,11 @@ def main(): ('c', "component", "Make-Suite-File-List::Options::Component", "HasArg"), ('h', "help", "Make-Suite-File-List::Options::Help"), ('n', "no-delete", "Make-Suite-File-List::Options::No-Delete"), - ('f', "force", "Make-Suite-File-List::Options::Force"), + ('f', "force", "Make-Suite-File-List::Options::Force"), ('s', "suite", "Make-Suite-File-List::Options::Suite", "HasArg")] for i in ["architecture", "component", "help", "no-delete", "suite", "force-touch" ]: - if not Cnf.has_key("Make-Suite-File-List::Options::%s" % (i)): - Cnf["Make-Suite-File-List::Options::%s" % (i)] = "" + if not Cnf.has_key("Make-Suite-File-List::Options::%s" % (i)): + Cnf["Make-Suite-File-List::Options::%s" % (i)] = "" apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) Options = Cnf.SubTree("Make-Suite-File-List::Options") if Options["Help"]: