Merge remote-tracking branch 'nthykier/auto-decruft'

[dak.git] / daklib / rm.py

diff --git a/daklib/rm.py b/daklib/rm.py
index ac966198deee4b2a553b71f34d24da6df060b43e..e6940d53de99fce1268c2588842ddc04cdcb346d 100644 (file)
--- a/daklib/rm.py
+++ b/daklib/rm.py
@@ -41,6 +41,7 @@
 
 import commands
 import apt_pkg
+import fcntl
 from re import sub
 from collections import defaultdict
 from regexes import re_build_dep_arch
@@ -77,18 +78,18 @@ class ReverseDependencyChecker(object):
         self._session = session
         dbsuite = get_suite(suite, session)
         suite_archs2id = dict((x.arch_string, x.arch_id) for x in get_suite_architectures(suite))
-        package_dependencies, arch_providors_of, arch_provided_by = self._load_package_information(session,
+        package_dependencies, arch_providers_of, arch_provided_by = self._load_package_information(session,
                                                                                                    dbsuite.suite_id,
                                                                                                    suite_archs2id)
         self._package_dependencies = package_dependencies
-        self._arch_providors_of = arch_providors_of
+        self._arch_providers_of = arch_providers_of
         self._arch_provided_by = arch_provided_by
         self._archs_in_suite = set(suite_archs2id)
 
     @staticmethod
     def _load_package_information(session, suite_id, suite_archs2id):
         package_dependencies = defaultdict(lambda: defaultdict(set))
-        arch_providors_of = defaultdict(lambda: defaultdict(set))
+        arch_providers_of = defaultdict(lambda: defaultdict(set))
         arch_provided_by = defaultdict(lambda: defaultdict(set))
         source_deps = defaultdict(set)
         metakey_d = get_or_set_metadatakey("Depends", session)
@@ -108,7 +109,7 @@ class ReverseDependencyChecker(object):
             deps = defaultdict(set)
             providers_of = defaultdict(set)
             provided_by = defaultdict(set)
-            arch_providors_of[architecture] = providers_of
+            arch_providers_of[architecture] = providers_of
             arch_provided_by[architecture] = provided_by
             package_dependencies[architecture] = deps
 
@@ -177,7 +178,7 @@ class ReverseDependencyChecker(object):
                 except ValueError as e:
                     print "Error for package %s: %s" % (source, e)
 
-        return package_dependencies, arch_providors_of, arch_provided_by
+        return package_dependencies, arch_providers_of, arch_provided_by
 
     def check_reverse_depends(self, removal_requests):
         """Bulk check reverse dependencies
@@ -205,7 +206,7 @@ class ReverseDependencyChecker(object):
         removals_by_arch = defaultdict(set)
         affected_virtual_by_arch = defaultdict(set)
         package_dependencies = self._package_dependencies
-        arch_providors_of = self._arch_providors_of
+        arch_providers_of = self._arch_providers_of
         arch_provided_by = self._arch_provided_by
         arch_provides2removal = defaultdict(lambda: defaultdict(set))
         dep_problems = defaultdict(set)
@@ -227,7 +228,7 @@ class ReverseDependencyChecker(object):
                     arch_all_removals.add(pkg)
                     continue
                 removals_by_arch[arch].add(pkg)
-                if pkg in arch_providors_of[arch]:
+                if pkg in arch_providers_of[arch]:
                     affected_virtual_by_arch[arch].add(pkg)
 
         if arch_all_removals:
@@ -236,7 +237,7 @@ class ReverseDependencyChecker(object):
                     continue
                 removals_by_arch[arch].update(arch_all_removals)
                 for pkg in arch_all_removals:
-                    if pkg in arch_providors_of[arch]:
+                    if pkg in arch_providers_of[arch]:
                         affected_virtual_by_arch[arch].add(pkg)
 
         if not removals_by_arch:
@@ -352,7 +353,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 = ''
 
     #######################################################################################################
 
@@ -371,7 +372,7 @@ def remove(session, reason, suites, removals,
     if date is None:
         date = commands.getoutput("date -R")
 
-    if partial:
+    if partial and components:
 
         component_ids_list = []
         for componentname in components:
@@ -380,7 +381,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]
@@ -422,6 +424,9 @@ def remove(session, reason, suites, removals,
     log_filename = cnf["Rm::LogFile"]
     log822_filename = cnf["Rm::LogFile822"]
     with utils.open_file(log_filename, "a") as logfile, utils.open_file(log822_filename, "a") as logfile822:
+        fcntl.lockf(logfile, fcntl.LOCK_EX)
+        fcntl.lockf(logfile822, fcntl.LOCK_EX)
+
         logfile.write("=========================================================================\n")
         logfile.write("[Date: %s] [ftpmaster: %s]\n" % (date, whoami))
         logfile.write("Removed the following packages from %s:\n\n%s" % (suites_list, summary))
@@ -460,7 +465,7 @@ def remove(session, reason, suites, removals,
                     session.execute("DELETE FROM bin_associations WHERE bin = :packageid AND suite = :suiteid",
                                     {'packageid': package_id, 'suiteid': suite_id})
                 # Delete from the override file
-                if partial:
+                if not partial:
                     if architecture == "source":
                         type_id = dsc_type_id
                     else: