X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fadmin.py;h=23b4c2d8e1a05ff17e1d7f8aecb51dab9e75c24c;hb=13a234f688c83e2e57e1187386b248b5fd798940;hp=5f0dcc9eeda8848c22ddb4b5536bd7bd647900e7;hpb=67b84a241c5f2a75b5ae2362257da3a1b285ae2c;p=dak.git diff --git a/dak/admin.py b/dak/admin.py index 5f0dcc9e..23b4c2d8 100755 --- a/dak/admin.py +++ b/dak/admin.py @@ -100,7 +100,7 @@ Perform administrative work on the dak database. v-c list show version checks for all suites v-c list-suite SUITE show version checks for suite SUITE v-c add SUITE CHECK REFERENCE add a version check for suite SUITE - v-c rm SUITE CHECK REFERENCE rmove a version check + v-c rm SUITE CHECK REFERENCE remove a version check where CHECK is one of Enhances, MustBeNewerThan, MustBeOlderThan REFERENCE is another suite name @@ -110,7 +110,7 @@ Perform administrative work on the dak database. ################################################################################ def __architecture_list(d, args): - q = d.session().query(Architecture).order_by('arch_string') + q = d.session().query(Architecture).order_by(Architecture.arch_string) for j in q.all(): # HACK: We should get rid of source from the arch table if j.arch_string == 'source': continue @@ -137,9 +137,9 @@ def __architecture_add(d, args): else: warn("W: Cannot find suite %s" % su) s.commit() - except IntegrityError, e: + except IntegrityError as e: die("E: Integrity error adding architecture %s (it probably already exists)" % args[2]) - except SQLAlchemyError, e: + except SQLAlchemyError as e: die("E: Error adding architecture %s (%s)" % (args[2], e)) print "Architecture %s added" % (args[2]) @@ -154,9 +154,9 @@ def __architecture_rm(d, args): die("E: Cannot find architecture %s" % args[2]) s.delete(a) s.commit() - except IntegrityError, e: + except IntegrityError as e: die("E: Integrity error removing architecture %s (suite-arch entries probably still exist)" % args[2]) - except SQLAlchemyError, e: + except SQLAlchemyError as e: die("E: Error removing architecture %s (%s)" % (args[2], e)) print "Architecture %s removed" % args[2] @@ -184,7 +184,7 @@ dispatch['a'] = architecture def __suite_list(d, args): s = d.session() - for j in s.query(Suite).order_by('suite_name').all(): + for j in s.query(Suite).order_by(Suite.suite_name).all(): print j.suite_name def __suite_show(d, args): @@ -216,6 +216,7 @@ def __suite_add(d, args, addallarches=False): s = d.session() suite = Suite() suite.suite_name = suite_name + suite.overridecodename = suite_name suite.version = version suite.label = get_field('label') suite.description = get_field('description') @@ -224,23 +225,18 @@ def __suite_add(d, args, addallarches=False): signingkey = get_field('signingkey') if signingkey is not None: suite.signingkeys = [signingkey.upper()] + suite.srcformats = s.query(SrcFormat).all() s.add(suite) s.flush() - for sf in s.query(SrcFormat).all(): - ssf = SuiteSrcFormat() - ssf.suite = suite - ssf.src_format = sf - s.add(ssf) - s.flush() - except IntegrityError, e: + except IntegrityError as e: die("E: Integrity error adding suite %s (it probably already exists)" % suite_name) - except SQLAlchemyError, e: + except SQLAlchemyError as e: die("E: Error adding suite %s (%s)" % (suite_name, e)) print "Suite %s added" % (suite_name) if addallarches: arches = [] - q = s.query(Architecture).order_by('arch_string') + q = s.query(Architecture).order_by(Architecture.arch_string) for arch in q.all(): suite.architectures.append(arch) arches.append(arch.arch_string) @@ -277,7 +273,7 @@ dispatch['s'] = suite def __suite_architecture_list(d, args): s = d.session() - for j in s.query(Suite).order_by('suite_name'): + for j in s.query(Suite).order_by(Suite.suite_name): architectures = j.get_architectures(skipsrc = True, skipall = True) print j.suite_name + ': ' + \ ', '.join([a.arch_string for a in architectures]) @@ -317,9 +313,9 @@ def __suite_architecture_add(d, args): try: suite.architectures.append(arch) s.commit() - except IntegrityError, e: + except IntegrityError as e: die("E: Can't add suite-architecture entry (%s, %s) - probably already exists" % (args[2].lower(), args[3].lower())) - except SQLAlchemyError, e: + except SQLAlchemyError as e: die("E: Can't add suite-architecture entry (%s, %s) - %s" % (args[2].lower(), args[3].lower(), e)) print "Added suite-architecture entry for %s, %s" % (args[2].lower(), args[3].lower()) @@ -342,9 +338,9 @@ def __suite_architecture_rm(d, args): die("E: architecture %s not found in suite %s" % (arch_string, suite_name)) suite.architectures.remove(architecture) s.commit() - except IntegrityError, e: + except IntegrityError as e: die("E: Can't remove suite-architecture entry (%s, %s) - it's probably referenced" % (args[2].lower(), args[3].lower())) - except SQLAlchemyError, e: + except SQLAlchemyError as e: die("E: Can't remove suite-architecture entry (%s, %s) - %s" % (args[2].lower(), args[3].lower(), e)) print "Removed suite-architecture entry for %s, %s" % (args[2].lower(), args[3].lower()) @@ -379,7 +375,7 @@ dispatch['s-a'] = suite_architecture def __version_check_list(d): session = d.session() - for s in session.query(Suite).order_by('suite_name'): + for s in session.query(Suite).order_by(Suite.suite_name): __version_check_list_suite(d, s.suite_name) def __version_check_list_suite(d, suite_name): @@ -541,9 +537,9 @@ def main(): if not Cnf.has_key("Admin::Options::%s" % (i)): Cnf["Admin::Options::%s" % (i)] = "" - arguments = apt_pkg.ParseCommandLine(Cnf, arguments, sys.argv) + arguments = apt_pkg.parse_commandline(Cnf, arguments, sys.argv) - options = Cnf.SubTree("Admin::Options") + options = Cnf.subtree("Admin::Options") if options["Help"] or len(arguments) < 1: usage() if options["Dry-Run"]: