usage()
projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
- database.init(Cnf, projectB)
+ daklib.database.init(Cnf, projectB)
# Sanity check options
if not arguments:
#
carbon_copy = []
for copy_to in daklib.utils.split_args(Options.get("Carbon-Copy")):
- if daklib.utils.str_isnum(copy_to):
+ if copy_to.isdigit():
carbon_copy.append(copy_to + "@" + Cnf["Dinstall::BugServer"])
elif copy_to == 'package':
for package in arguments:
field = "b.package"
else:
field = "s.source"
- con_packages = "AND %s IN (%s)" % (field, ", ".join(map(repr, arguments)))
+ con_packages = "AND %s IN (%s)" % (field, ", ".join([ repr(i) for i in arguments ]))
(con_suites, con_architectures, con_components, check_source) = \
daklib.utils.parse_args(Options)
suites_list = daklib.utils.join_with_commas_and(suites)
if not Options["No-Action"]:
for suite in suites:
- suite_id = database.get_suite_id(suite)
+ suite_id = daklib.database.get_suite_id(suite)
if suite_id != -1:
suite_ids_list.append(suite_id)
if suite == "stable":
maintainer_list = []
for maintainer_id in maintainers.keys():
- maintainer_list.append(database.get_maintainer(maintainer_id))
+ maintainer_list.append(daklib.database.get_maintainer(maintainer_id))
summary = ""
removals = d.keys()
removals.sort()
logfile.write("----------------------------------------------\n")
logfile.flush()
- dsc_type_id = database.get_override_type_id('dsc')
- deb_type_id = database.get_override_type_id('deb')
+ dsc_type_id = daklib.database.get_override_type_id('dsc')
+ deb_type_id = daklib.database.get_override_type_id('deb')
# Do the actual deletion
print "Deleting...",
Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
else:
Subst["__BCC__"] = "X-Filler: 42"
- Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: this header is obsolete"
+ Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie $Revision: 1.44 $"
if carbon_copy:
Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy)
Subst["__SUITE_LIST__"] = suites_list