Merge commit 'dak-master/master' into dm_upload_allowed

Conflicts:

	ChangeLog

Signed-off-by: Michael Casadevall <sonicmctails@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index 7233547eb8c9672b05b3f7ade65b7553fb9de095..c3d4a6e23417b7667f24be23e28de0f9ee4f90ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-28  Frank Lichtenheld  <djpig@debian.org>
+
+       * dak/override.py (main): Handle source-only packages better
+
 2008-12-26  Michael Casadevall <sonicmctails@gmail.com>
 
         * dak/import_keyring.py - Debrainized the projectb schema w.r.t. to DMs
@@ -11,9 +15,6 @@
 
         * setup/init_pool.sql - More of the same
 
-
-2008-12-26  Michael Casadevall <sonicmctails@gmail.com>
-
         * dak/process_unchecked.py - Implemented new dm_upload_allowed field in source
 
         * dak/process_unchecked.py - Fixed bug where dm-upload-allowed would not be respected

diff --git a/dak/override.py b/dak/override.py
index ca3cb41d6a77d2245c25afd56454a51d59805ebb..f98f03c5ae21a2f761fa1bd9550949e7e90a4b97 100755 (executable)
--- a/dak/override.py
+++ b/dak/override.py
@@ -134,6 +134,7 @@ def main ():
             oldpriority = r[0][0]
         else:
             oldsourcesection = r[0][1]
+            oldpriority = 'source'
 
     if not oldpriority and not oldsourcesection:
         utils.fubar("Unable to find package %s" % (package))
@@ -144,13 +145,8 @@ def main ():
         oldsection = oldsourcesection
 
     if not arguments:
-        if oldpriority:
-            print "%s is in section '%s' at priority '%s'" % (
-                package,oldsection,oldpriority)
-        elif oldsourcesection:
-            # no use printing this line if also binary
-            print "%s is in section '%s'" % (
-                package,oldsourcesection)
+        print "%s is in section '%s' at priority '%s'" % (
+            package,oldsection,oldpriority)
         sys.exit(0)
 
     # At this point, we have a new section and priority... check they're valid...
@@ -179,8 +175,8 @@ def main ():
         print "I: Doing nothing"
         sys.exit(0)
 
-    if newpriority and not oldpriority:
-        utils.fubar("Trying to set priority of a source-only package")
+    if oldpriority == 'source' and newpriority != 'source':
+        utils.fubar("Trying to change priority of a source-only package")
 
     # If we're in no-action mode
     if Options["No-Action"]: