Speed up searching for files that need to be removed.

diff --git a/po/pakfire.pot b/po/pakfire.pot
index 0f87a8e77681b27bf5fe11c61302179debc39427..3bd08653a511bdd9511ff8917b0f5890708a338b 100644 (file)
--- a/po/pakfire.pot
+++ b/po/pakfire.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-25 20:58+0200\n"
+"POT-Creation-Date: 2011-10-25 21:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/python/pakfire/packages/installed.py b/python/pakfire/packages/installed.py
index 2072524950f89e046a90d54eaac58639211461d7..ba7cbab7663992662d6f948e7b2f740b8ad1cf70 100644 (file)
--- a/python/pakfire/packages/installed.py
+++ b/python/pakfire/packages/installed.py
@@ -280,19 +280,23 @@ class DatabasePackage(Package):
 
                # Fetch the whole filelist of the system from the database and create
                # a diff. Exclude files from this package - of course.
-               c.execute("SELECT name FROM files WHERE pkg != ?", (self.id,))
+               c.execute("SELECT DISTINCT name FROM files WHERE pkg != ?", (self.id,))
 
+               installed_files = set()
                for row in c:
-                       # Check if file in filelist.
-                       for f in files:
-                               if not row["name"] == f.name:
-                                       continue
-
-                               files.remove(f)
-                               break
+                       installed_files.add(row["name"])
                c.close()
 
-               self._remove_files(files, message, prefix)
+               # List with files to be removed.
+               remove_files = []
+
+               for f in files:
+                       if f.name in installed_files:
+                               continue
+
+                       remove_files.append(f)
+
+               self._remove_files(remove_files, message, prefix)
 
 
 # XXX maybe we can remove this later?