Merge lp:~aptdaemon-developers/aptdaemon/cached-changelogs into lp:aptdaemon

[Sebastian Heinlein]

The changelogs are cached in "Dir::Cache::Changelog" which defaults to /var/cache/apt/Changelog

[Michael Vogt (mvo)]

That looks great.

What I also don't get is where the changelogs are cached in the first place, but maybe that is already part of the code?

This code :
if pkg.name.startswith("linux-image-") or \
 pkg.name in ["libc6", "dbus"]:
        restart == RESTART_SYSTEM

could probably use the nwe (and yet unused) XB-Restart-Required bit in the packages file.

review: Approve

[Sebastian Heinlein (glatzor)]

The changelog gets written after being downloaded - line 57 ff

[Sebastian Heinlein (glatzor)]

The XB-Restart-Required bit is Ubuntu only?

[Michael Vogt (mvo)]

Its currently ubuntu only not not really used, but I think its really useful, so we could suggest it to debian as well.

=== modified file 'aptdaemon/pkcompat.py'
--- aptdaemon/pkcompat.py	2011-11-25 00:23:33 +0000
+++ aptdaemon/pkcompat.py	2011-11-25 09:18:23 +0000
@@ -18,6 +18,8 @@
 __author__  = "Sebastian Heinlein <[e-mail]>"
 
 import datetime
+import glob
+import gzip
 import locale
 import logging
 import os
@@ -2196,13 +2198,45 @@
             #       a reboot on Ubuntu but not on Debian
             if pkg.name.startswith("linux-image-") or \
                pkg.name in ["libc6", "dbus"]:
-                restart == RESTART_SYSTEM
-            changelog_raw = pkg.getChangelog()
-            # The internal download error string of python-apt ist not
-            # provided as unicode object
-            if not isinstance(changelog_raw, unicode):
-                changelog_raw = changelog_raw.decode(DEFAULT_ENCODING)
-            # Convert the changelog to markdown syntax
+                restart == pk_enums.RESTART_SYSTEM
+            changelog_dir = apt_pkg.config.find_dir("Dir::Cache::Changelog")
+            if changelog_dir == "/":
+                changelog_dir = os.path.join(apt_pkg.config.find_dir("Dir::"
+                                                                     "Cache"),
+                                             "Changelog")
+            filename = os.path.join(changelog_dir,
+                                    "%s_%s.gz" % (pkg.name,
+                                                  pkg.candidate.version))
+            changelog_raw = ""
+            if os.path.exists(filename):
+                pklog.debug("Reading changelog from cache")
+                changelog_file = gzip.open(filename, "rb")
+                try:
+                    changelog_raw = changelog_file.read().decode("UTF-8")
+                except:
+                    pass
+                finally:
+                    changelog_file.close()
+            if not changelog_raw:
+                pklog.debug("Downloading changelog")
+                changelog_raw = pkg.get_changelog()
+                # The internal download error string of python-apt ist not
+                # provided as unicode object
+                if not isinstance(changelog_raw, unicode):
+                    changelog_raw = changelog_raw.decode("UTF-8")
+                # Cache the fetched changelog
+                if not os.path.exists(changelog_dir):
+                    os.makedirs(changelog_dir)
+                # Remove old cached changelogs
+                pattern = os.path.join(changelog_dir, "%s_*" % pkg.name)
+                for old_changelog in glob.glob(pattern):
+                    os.rm(os.path.join(changelog_dir, old_changelog))
+                changelog_file = gzip.open(filename, mode="wb")
+                try:
+                    changelog_file.write(changelog_raw.encode("UTF-8"))
+                finally:
+                    changelog_file.close()
+           # Convert the changelog to markdown syntax
             changelog = u""
             for line in changelog_raw.split("\n"):
                 if line == "":