X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Foverride.py;h=9b4b3f6d09344638a321b87cac5b42bdf3fd9515;hb=bf7e1ddfb0bc42efad1d58b7010298919f65ecca;hp=258484ef189a7da7d40f83afb8dd6eea9583a80a;hpb=e2ae71066cbb134753d7bfceb16e87d0b76dfd6e;p=dak.git

diff --git a/dak/override.py b/dak/override.py
index 258484ef..9b4b3f6d 100755
--- a/dak/override.py
+++ b/dak/override.py
@@ -26,7 +26,8 @@
 ################################################################################
 
 import pg, sys
-import apt_pkg, logging
+import apt_pkg
+import daklib.logging
 import daklib.database
 import daklib.utils
 
@@ -47,7 +48,7 @@ def game_over():
 
 def usage (exit_code=0):
     print """Usage: dak override [OPTIONS] package [section] [priority]
-Make microchanges or microqueries of the overrides
+Make microchanges or microqueries of the binary overrides
 
   -h, --help                 show this help and exit
   -d, --done=BUG#            send priority/section change as closure to bug#
@@ -104,12 +105,14 @@ def main ():
         else:
             daklib.utils.fubar("%s is not a valid section or priority" % (arg))
 
-
     # Retrieve current section/priority...
+    # TODO: fetch dsc records and update them too, if needed.
     q = projectB.query("""
-    SELECT priority.priority AS prio, section.section AS sect
-      FROM override, priority, section, suite
+    SELECT priority.priority AS prio, section.section AS sect, override_type.type AS type
+      FROM override, priority, section, suite, override_type
      WHERE override.priority = priority.id
+       AND override.type = override_type.id
+       AND override_type.type != 'dsc'
        AND override.section = section.id
        AND override.package = %s
        AND override.suite = suite.id
@@ -220,7 +223,7 @@ def main ():
             Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
         else:
             Subst["__BCC__"] = "X-Filler: 42"
-        Subst["__CC__"] = "X-DAK: dak override"
+        Subst["__CC__"] = "X-DAK: dak override\nX-Katie: alicia $Revision: 1.6$"
         Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]
         Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"]
         Subst["__WHOAMI__"] = daklib.utils.whoami()