import pg, sys
import apt_pkg
-import daklib.logging
-import daklib.database
-import daklib.utils
+import daklib.logging as logging
+import daklib.database as database
+import daklib.utils as utils
################################################################################
################################################################################
-# Shamelessly stolen from 'dak rm'. Should probably end up in daklib.utils.py
+# Shamelessly stolen from 'dak rm'. Should probably end up in utils.py
def game_over():
- answer = daklib.utils.our_raw_input("Continue (y/N)? ").lower()
+ answer = utils.our_raw_input("Continue (y/N)? ").lower()
if answer != "y":
print "Aborted."
sys.exit(1)
def main ():
global Cnf, projectB
- Cnf = daklib.utils.get_conf()
+ Cnf = utils.get_conf()
Arguments = [('h',"help","Override::Options::Help"),
('d',"done","Override::Options::Done", "HasArg"),
('s',"suite","Override::Options::Suite", "HasArg"),
]
for i in ["help", "no-action"]:
- if not Cnf.has_key("Override::Options::%s" % (i)):
- Cnf["Override::Options::%s" % (i)] = ""
+ if not Cnf.has_key("Override::Options::%s" % (i)):
+ Cnf["Override::Options::%s" % (i)] = ""
if not Cnf.has_key("Override::Options::Suite"):
- Cnf["Override::Options::Suite"] = "unstable"
+ Cnf["Override::Options::Suite"] = "unstable"
arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
Options = Cnf.SubTree("Override::Options")
if Options["Help"]:
- usage()
+ usage()
projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
- daklib.database.init(Cnf, projectB)
+ database.init(Cnf, projectB)
if not arguments:
- daklib.utils.fubar("package name is a required argument.")
+ utils.fubar("package name is a required argument.")
package = arguments.pop(0)
suite = Options["Suite"]
if arguments and len(arguments) > 2:
- daklib.utils.fubar("Too many arguments")
+ utils.fubar("Too many arguments")
if arguments and len(arguments) == 1:
# Determine if the argument is a priority or a section...
elif r[0][1] == 1:
arguments = (".",arg)
else:
- daklib.utils.fubar("%s is not a valid section or priority" % (arg))
+ 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("""
+ oldsection, oldsourcesection, oldpriority = None, None, None
+ for type in ['source', 'binary']:
+ eqdsc = '!='
+ if type == 'source':
+ eqdsc = '='
+ q = projectB.query("""
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_type.type %s 'dsc'
AND override.section = section.id
AND override.package = %s
AND override.suite = suite.id
AND suite.suite_name = %s
- """ % (pg._quote(package,"str"), pg._quote(suite,"str")))
+ """ % (eqdsc, pg._quote(package,"str"), pg._quote(suite,"str")))
- if q.ntuples() == 0:
- daklib.utils.fubar("Unable to find package %s" % (package))
- if q.ntuples() > 1:
- daklib.utils.fubar("%s is ambiguous. Matches %d packages" % (package,q.ntuples()))
+ if q.ntuples() == 0:
+ continue
+ if q.ntuples() > 1:
+ utils.fubar("%s is ambiguous. Matches %d packages" % (package,q.ntuples()))
- r = q.getresult()
- oldsection = r[0][1]
- oldpriority = r[0][0]
+ r = q.getresult()
+ if type == 'binary':
+ oldsection = r[0][1]
+ oldpriority = r[0][0]
+ else:
+ oldsourcesection = r[0][1]
+
+ if not oldpriority and not oldsourcesection:
+ utils.fubar("Unable to find package %s" % (package))
+ if oldsection and oldsourcesection and oldsection != oldsourcesection:
+ # When setting overrides, both source & binary will become the same section
+ utils.warn("Source is in section '%s' instead of '%s'" % (oldsourcesection, oldsection))
+ if not oldsection:
+ oldsection = oldsourcesection
if not arguments:
- print "%s is in section '%s' at priority '%s'" % (
- package,oldsection,oldpriority)
+ 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)
sys.exit(0)
# At this point, we have a new section and priority... check they're valid...
pg._quote(newsection,"str")))
if q.ntuples() == 0:
- daklib.utils.fubar("Supplied section %s is invalid" % (newsection))
+ utils.fubar("Supplied section %s is invalid" % (newsection))
newsecid = q.getresult()[0][0]
q = projectB.query("SELECT id FROM priority WHERE priority=%s" % (
pg._quote(newpriority,"str")))
if q.ntuples() == 0:
- daklib.utils.fubar("Supplied priority %s is invalid" % (newpriority))
+ utils.fubar("Supplied priority %s is invalid" % (newpriority))
newprioid = q.getresult()[0][0]
if newpriority == oldpriority and newsection == oldsection:
print "I: Doing nothing"
sys.exit(0)
+ if newpriority and not oldpriority:
+ utils.fubar("Trying to set priority of a source-only package")
+
# If we're in no-action mode
if Options["No-Action"]:
if newpriority != oldpriority:
if not Options.has_key("Done"):
pass
- #daklib.utils.warn("No bugs to close have been specified. Noone will know you have done this.")
+ #utils.warn("No bugs to close have been specified. Noone will know you have done this.")
else:
print "I: Will close bug(s): %s" % (Options["Done"])
game_over()
- Logger = daklib.logging.Logger(Cnf, "override")
+ Logger = logging.Logger(Cnf, "override")
projectB.query("BEGIN WORK")
# We're in "do it" mode, we have something to do... do it
UPDATE override
SET priority=%d
WHERE package=%s
+ AND override.type != %d
AND suite = (SELECT id FROM suite WHERE suite_name=%s)""" % (
newprioid,
- pg._quote(package,"str"),
+ pg._quote(package,"str"), database.get_override_type_id("dsc"),
pg._quote(suite,"str") ))
Logger.log(["changed priority",package,oldpriority,newpriority])
newsecid,
pg._quote(package,"str"),
pg._quote(suite,"str") ))
- Logger.log(["changed priority",package,oldsection,newsection])
+ Logger.log(["changed section",package,oldsection,newsection])
projectB.query("COMMIT WORK")
if Options.has_key("Done"):
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()
+ Subst["__WHOAMI__"] = utils.whoami()
summary = "Concerning package %s...\n" % (package)
summary += "Operating on the %s suite\n" % (suite)
summary += "Changed section from %s to %s\n" % (oldsection,newsection)
Subst["__SUMMARY__"] = summary
- for bug in daklib.utils.split_args(Options["Done"]):
+ for bug in utils.split_args(Options["Done"]):
Subst["__BUG_NUMBER__"] = bug
- mail_message = daklib.utils.TemplateSubst(
+ mail_message = utils.TemplateSubst(
Subst,Cnf["Dir::Templates"]+"/override.bug-close")
- daklib.utils.send_mail(mail_message)
+ utils.send_mail(mail_message)
Logger.log(["closed bug",bug])
Logger.close()