From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 25 Mar 2011 14:01:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'ansgar/dak-admin-show-config' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=4d93fa91d9332090e0fbab687f66014368c8c8c5;hp=788aa4ad2ffc3a36dc6b41e433119feae26dc9a5;p=dak.git

Merge remote-tracking branch 'ansgar/dak-admin-show-config' into merge

* ansgar/dak-admin-show-config:
  admin: Show options set in configuration database

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/dak/admin.py b/dak/admin.py
index 808fb887..d159651e 100755
--- a/dak/admin.py
+++ b/dak/admin.py
@@ -59,6 +59,7 @@ Perform administrative work on the dak database.
   config / c:
      c db                   show db config
      c db-shell             show db config in a usable form for psql
+     c NAME                 show option NAME as set in configuration table
 
   architecture / a:
      a list                 show a list of architectures
@@ -456,7 +457,12 @@ def show_config(command):
             e.append('PGPORT')
         print "export " + " ".join(e)
     else:
-        die("E: config command unknown")
+        session = DBConn().session()
+        try:
+            o = session.query(DBConfig).filter_by(name = mode).one()
+            print o.value
+        except NoResultFound:
+            print "W: option '%s' not set" % mode
 
 dispatch['config'] = show_config
 dispatch['c'] = show_config