X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Foverride.py;h=f98f03c5ae21a2f761fa1bd9550949e7e90a4b97;hb=203e76d0f6eddac1ad270d68df5e96357d0d0011;hp=ca3cb41d6a77d2245c25afd56454a51d59805ebb;hpb=7402479d0a07a577496fd056d1b4b6299c060fea;p=dak.git 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"]: