auto-decruft: Disable short options for NVI

[dak.git] / daklib / rm.py

diff --git a/daklib/rm.py b/daklib/rm.py
index ac966198deee4b2a553b71f34d24da6df060b43e..71fe792a2d08a3232bf65f99a34da346f28f9113 100644 (file)
--- 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]