X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Frm.py;h=71fe792a2d08a3232bf65f99a34da346f28f9113;hb=03a86547e5d9b209016cc0b23f825d3baea92f8c;hp=b479325508847ca99b7820b683efda99405e4eaf;hpb=ff1199ac0537c8eb6f502ed56578595311b38605;p=dak.git diff --git a/daklib/rm.py b/daklib/rm.py index b4793255..71fe792a 100644 --- a/daklib/rm.py +++ b/daklib/rm.py @@ -352,7 +352,7 @@ def remove(session, reason, suites, removals, suite_ids_list = [] suites_list = utils.join_with_commas_and(suites) cnf = utils.get_conf() - con_components = None + con_components = '' ####################################################################################################### @@ -380,7 +380,8 @@ def remove(session, reason, suites, removals, raise ValueError("component '%s' not recognised." % componentname) else: component_ids_list.append(component.component_id) - con_components = "AND component IN (%s)" % ", ".join([str(i) for i in component_ids_list]) + if component_ids_list: + con_components = "AND component IN (%s)" % ", ".join([str(i) for i in component_ids_list]) for i in removals: package = i[0] @@ -393,7 +394,7 @@ def remove(session, reason, suites, removals, if architecture not in d[package][version]: d[package][version].append(architecture) - for package in sorted(removals): + for package in sorted(d): versions = sorted(d[package], cmp=apt_pkg.version_compare) for version in versions: d[package][version].sort(utils.arch_compare_sw)