X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fadmin.py;h=218eea578ed7ef9bf5f78a32898f745570c91827;hb=15a944c0f60ff8464b57b9532be660214a3a6bbc;hp=dbf1d45d5df1c097f499608d5a20826b22de89f4;hpb=ce828cf5a3557613771eab8f0ad59586bbbcecbb;p=dak.git diff --git a/dak/admin.py b/dak/admin.py index dbf1d45d..218eea57 100755 --- a/dak/admin.py +++ b/dak/admin.py @@ -55,6 +55,10 @@ Perform administrative work on the dak database. Commands can use a long or abbreviated form: + config / c: + c db show db config + c db-shell show db config in a usable form for psql + architecture / a: a list show a list of architectures a rm ARCH remove an architecture (will only work if @@ -73,6 +77,7 @@ Perform administrative work on the dak database. description, origin and codename are optional. suite-architecture / s-a: + s-a list show the architectures for all suites s-a list-suite ARCH show the suites an ARCH is in s-a list-arch SUITE show the architectures in a SUITE s-a add SUITE ARCH add ARCH to suite @@ -92,10 +97,11 @@ def __architecture_list(d, args): sys.exit(0) def __architecture_add(d, args): - die_arglen(args, 3, "E: adding an architecture requires a name and a description") + die_arglen(args, 4, "E: adding an architecture requires a name and a description") print "Adding architecture %s" % args[2] suites = [str(x) for x in args[4:]] - print suites + if len(suites) > 0: + print "Adding to suites %s" % ", ".join(suites) if not dryrun: try: s = d.session() @@ -104,12 +110,9 @@ def __architecture_add(d, args): a.description = str(args[3]) s.add(a) for sn in suites: - su = get_suite(sn ,s) + su = get_suite(sn, s) if su is not None: - archsu = SuiteArchitecture() - archsu.arch_id = a.arch_id - archsu.suite_id = su.suite_id - s.add(archsu) + a.suites.append(su) else: warn("W: Cannot find suite %s" % su) s.commit() @@ -230,22 +233,27 @@ dispatch['s'] = suite def __suite_architecture_list(d, args): s = d.session() - for j in s.query(Suite).order_by('suite_name').all(): - print j.suite_name + ' ' + \ - ','.join([a.architecture.arch_string for a in j.suitearchitectures]) + for j in s.query(Suite).order_by('suite_name'): + architectures = j.get_architectures(skipsrc = True, skipall = True) + print j.suite_name + ': ' + \ + ', '.join([a.arch_string for a in architectures]) def __suite_architecture_listarch(d, args): die_arglen(args, 3, "E: suite-architecture list-arch requires a suite") - a = get_suite_architectures(args[2].lower()) + suite = get_suite(args[2].lower(), d.session()) + if suite is None: + die('E: suite %s is invalid' % args[2].lower()) + a = suite.get_architectures(skipsrc = True, skipall = True) for j in a: - # HACK: We should get rid of source from the arch table - if j.arch_string != 'source': - print j.arch_string + print j.arch_string def __suite_architecture_listsuite(d, args): die_arglen(args, 3, "E: suite-architecture list-suite requires an arch") - for j in get_architecture_suites(args[2].lower()): + architecture = get_architecture(args[2].lower(), d.session()) + if architecture is None: + die("E: architecture %s is invalid" % args[2].lower()) + for j in architecture.suites: print j.suite_name @@ -263,10 +271,7 @@ def __suite_architecture_add(d, args): if not dryrun: try: - sa = SuiteArchitecture() - sa.arch_id = arch.arch_id - sa.suite_id = suite.suite_id - s.add(sa) + suite.architectures.append(arch) s.commit() except IntegrityError, e: die("E: Can't add suite-architecture entry (%s, %s) - probably already exists" % (args[2].lower(), args[3].lower())) @@ -283,10 +288,15 @@ def __suite_architecture_rm(d, args): s = d.session() if not dryrun: try: - sa = get_suite_architecture(args[2].lower(), args[3].lower(), s) - if sa is None: - die("E: can't find suite-architecture entry for %s, %s" % (args[2].lower(), args[3].lower())) - s.delete(sa) + suite_name = args[2].lower() + suite = get_suite(suite_name, s) + if suite is None: + die('E: no such suite %s' % suite_name) + arch_string = args[3].lower() + architecture = get_architecture(arch_string, s) + if architecture not in suite.architectures: + die("E: architecture %s not found in suite %s" % (arch_string, suite_name)) + suite.architectures.remove(architecture) s.commit() except IntegrityError, e: die("E: Can't remove suite-architecture entry (%s, %s) - it's probably referenced" % (args[2].lower(), args[3].lower())) @@ -323,6 +333,54 @@ dispatch['s-a'] = suite_architecture ################################################################################ +def show_config(command): + args = [str(x) for x in command] + cnf = utils.get_conf() + + die_arglen(args, 2, "E: config needs at least a command") + + mode = args[1].lower() + + if mode == 'db': + connstr = "" + if cnf.has_key("DB::Service"): + # Service mode + connstr = "postgresql://service=%s" % cnf["DB::Service"] + elif cnf.has_key("DB::Host"): + # TCP/IP + connstr = "postgres://%s" % cnf["DB::Host"] + if cnf.has_key("DB::Port") and cnf["DB::Port"] != "-1": + connstr += ":%s" % cnf["DB::Port"] + connstr += "/%s" % cnf["DB::Name"] + else: + # Unix Socket + connstr = "postgres:///%s" % cnf["DB::Name"] + if cnf["DB::Port"] and cnf["DB::Port"] != "-1": + connstr += "?port=%s" % cnf["DB::Port"] + print connstr + elif mode == 'db-shell': + e = [] + if cnf.has_key("DB::Service"): + e.append('PGSERVICE') + print "PGSERVICE=%s" % cnf["DB::Service"] + if cnf.has_key("DB::Name"): + e.append('PGDATABASE') + print "PGDATABASE=%s" % cnf["DB::Name"] + if cnf.has_key("DB::Host"): + print "PGHOST=%s" % cnf["DB::Host"] + e.append('PGHOST') + if cnf.has_key("DB::Port") and cnf["DB::Port"] != "-1": + print "PGPORT=%s" % cnf["DB::Port"] + e.append('PGPORT') + print "export " + " ".join(e) + else: + die("E: config command unknown") + +dispatch['config'] = show_config +dispatch['c'] = show_config + +################################################################################ + def main(): """Perform administrative work on the dak database""" global dryrun