[rmurray] limit override to binaries for now

diff --git a/ChangeLog b/ChangeLog
index 4a504f8ac79cf72cf696b4bb7c316fcb9ae906df..46a1d9de9da628c2dafcc1dbe4f5181973a3ecdc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
 
 2007-02-08  Ryan Murray  <rmurray@debian.org>
 
+       * dak/override.py (main): limit to binary overrides only for now.
+       (usage): update to match.
+
        * config/debian/cron.daily: track when we have the accepted lock
        and clean it up on exit if we have it.  Take/check the
        cron.unchecked lock just before traping to cleanup on exit.

diff --git a/dak/override.py b/dak/override.py
index 7d9d80a26187dcc4dc293d57e9c4de8365635906..9b4b3f6d09344638a321b87cac5b42bdf3fd9515 100755 (executable)
--- a/dak/override.py
+++ b/dak/override.py
@@ -48,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#
@@ -105,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