Merge lp:~andersk/update-notifier/apt-check-speed into lp:update-notifier/ubuntu

[Anders Kaseorg]

Speed up apt-check from 9 seconds to 1.9 seconds by removing ancient cruft.

[Brian Murray (brian-murray)]

I believe you've removed a bit too much here as depcache.read_pinfile() would read /etc/apt/preferences or /etc/apt/preferences.d/.

[Anders Kaseorg (andersk)]

Those are already read by default (pkgCacheFile::Open → pkgCacheFile::BuildPolicy → ReadPinFile, ReadPinDir). There’s no need to read them again. I tested that my version still respects pins.

[Brian Murray (brian-murray)]

Got it, thanks for working on this.

=== modified file 'data/apt_check.py'
--- data/apt_check.py	2012-10-16 13:45:38 +0000
+++ data/apt_check.py	2013-10-01 11:17:52 +0000
@@ -72,11 +72,6 @@
     # FIXME: do a ionice here too?
     os.nice(19)
     apt_pkg.init()
-    # force apt to build its caches in memory for now to make sure
-    # that there is no race when the pkgcache file gets re-generated
-    #apt_pkg.config.set("debug::pkgcachegen","1")
-    apt_pkg.config.set("Dir::Cache::pkgcache","")
-    apt_pkg.config.set("Dir::Cache::srcpkgcache","")
     
 def run(options=None):
 
@@ -95,14 +90,10 @@
         sys.exit(-1)
     depcache = apt_pkg.DepCache(cache)
 
-    # read the pin files
-    depcache.read_pinfile()
     # read the synaptic pins too
     if os.path.exists(SYNAPTIC_PINFILE):
         depcache.read_pinfile(SYNAPTIC_PINFILE)
-
-    # init the depcache
-    depcache.init()
+        depcache.init()
 
     if depcache.broken_count > 0:
         sys.stderr.write("E: "+ _("Error: BrokenCount > 0"))