Merge lp:~benji/landscape-client/create-empty-apt-keyring-for-trusty into lp:~landscape/landscape-client/trunk

[Benji York]

Bug 1326078 was caused by apt on trusty requiring a keyring file (even if
empty) exist in its directory structure. Since we create a fake directory
structure for it to operate on, we need to create a keyring too.

Bug 1326078 was caused by apt on trusty requiring a keyring file (even if
empty) exist in its directory structure. Since we create a fake directory
structure for it to operate on, we need to create a keyring too.

[Björn Tillenius (bjornt)]

Looks good to me, +1

review: Approve

[Alberto Donato (ack)]

+1!

Small nitpick inline.

review: Approve

[lp:~benji/landscape-client/create-empty-apt-keyring-for-trusty]

772. By Benji York on 2014-06-16

use touch_file instead of create_file

=== modified file 'landscape/package/facade.py'
--- landscape/package/facade.py	2013-09-23 09:44:45 +0000
+++ landscape/package/facade.py	2014-06-16 12:07:56 +0000
@@ -22,7 +22,7 @@
 from apt.progress.text import AcquireProgress
 from apt.progress.base import InstallProgress
 
-from landscape.lib.fs import append_file, create_file, read_file
+from landscape.lib.fs import append_file, create_file, read_file, touch_file
 from landscape.constants import UBUNTU_PATH
 from landscape.package.skeleton import build_skeleton_apt
 
@@ -143,7 +143,7 @@
         self.refetch_package_index = False
 
     def _ensure_dir_structure(self):
-        self._ensure_sub_dir("etc/apt")
+        apt_dir = self._ensure_sub_dir("etc/apt")
         self._ensure_sub_dir("etc/apt/sources.list.d")
         self._ensure_sub_dir("var/cache/apt/archives/partial")
         self._ensure_sub_dir("var/lib/apt/lists/partial")
@@ -155,6 +155,9 @@
         self._dpkg_status = os.path.join(dpkg_dir, "status")
         if not os.path.exists(self._dpkg_status):
             create_file(self._dpkg_status, "")
+        # Apt will fail if it does not have a keyring.  It does not care if
+        # the keyring is empty.
+        touch_file(os.path.join(apt_dir, "trusted.gpg"))
 
     def _ensure_sub_dir(self, sub_dir):
         """Ensure that a dir in the Apt root exists."""

=== modified file 'landscape/package/tests/test_facade.py'
--- landscape/package/tests/test_facade.py	2013-09-27 14:01:32 +0000
+++ landscape/package/tests/test_facade.py	2014-06-16 12:07:56 +0000
@@ -2573,6 +2573,14 @@
         self.assertEqual(
             apt_pkg.SELSTATE_DEINSTALL, foo.package._pkg.selected_state)
 
+    def test_creation_of_key_ring(self):
+        """
+        Apt on Trusty requires a keyring exist in its directory structure, so
+        we create an empty file to appease it.
+        """
+        keyring_path = os.path.join(self.facade._root, "etc/apt/trusted.gpg")
+        self.assertTrue(os.path.exists(keyring_path))
+
     if not hasattr(Package, "shortname"):
         # The 'shortname' attribute was added when multi-arch support
         # was added to python-apt. So if it's not there, it means that