From e1bc636b5ec3fb1a6766ffc1aac404d719222fd5 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sun, 28 Dec 2008 19:07:22 +0000 Subject: [PATCH] override: Handle source-only packages better --- dak/override.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dak/override.py b/dak/override.py index ca3cb41d..f98f03c5 100755 --- 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"]: -- 2.39.5