Merge lp:~brian-murray/apport/support-ppa-packages into lp:~apport-hackers/apport/trunk

[Brian Murray]

This branch builds upon Tim Lunn's initial work (https://code.launchpad.net/~darkxst/apport/per-ppa-config2/+merge/180972) to add PPA support to apport-retrace.

A list of "origins" is created for packages with a foreign origin. This is then passed to install packages so that the sandbox will be created with proper apt data sources for the PPA. Its also possible to setup an apt data source that will be used when creating the sandbox. For consistency with apt these sources are located in /etc/apt/sources.list.d/, they can either be named the same as the PPA (brian-murray-ppa.list) or with LP-PPA- preceeding the PPA name. This was done since the origin information is listed as LP-PPA-brian-murray-ppa and people may use that when setting up a configuration for apport-retrace. I've also added apt keyring support for any PPAs added.

The following new tests were added to test_backend_apt_dpkg.py:
    def test_create_sources_for_a_named_ppa(self):
    def test_create_sources_for_an_unnamed_ppa(self):
    def test_use_sources_for_a_ppa(self):
    def test_install_package_from_a_ppa(self):

They test the creation of a sources.list entry for two different types of PPAs, using a configured sources.list entry for a PPA, and installing a package from a PPA. Three of the tests are dependent upon two PPAs being available which might be a point of concern.

[Martin Pitt (pitti)]

Thanks Brian! The general idea looks fine; with the restricted "Origin:" fields that we have there's no way around the guesswork.

review: Needs Fixing

[lp:~brian-murray/apport/support-ppa-packages]

2979. By Brian Murray on 2015-07-03

mess o' modifications based on pitti's feeback

[Brian Murray (brian-murray)]

Thanks for all the comments, I think I have addressed all of them and the code should look better now.

[Brian Murray (brian-murray)]

Steve indicated there may be some security concerns about installing any package from Launchpad and running that package's binaries inside gdb. Subsequently, I have made the ability to create apt data sources for PPAs an optional one and set the default value to false. Regardless, if there are sources.list entries in the configdir corresponding to a PPA then packages will be used from those PPAs.

[lp:~brian-murray/apport/support-ppa-packages]

2980. By Brian Murray on 2015-07-06

Add an option to apport-retrace (and pass it along) so that apt sources data is only created for PPAs if requested.

[Steve Langasek (vorlon)]

Security concerns, and also infrastructure load concerns. I don't believe we've made any committment to providing retracing resources for crashes of packages originating from arbitrary ppas.

[lp:~brian-murray/apport/support-ppa-packages]

2981. By Brian Murray on 2015-07-06

Fix origins re, pass log_timestamps to make_sandbox, fix a bug in origin_path existence checking.

2982. By Brian Murray on 2015-07-07

explicitly close the results from urlopen

[Martin Pitt (pitti)]

A couple of inline replies to the previous review round. I'll review the new code in a separate comment.

[Martin Pitt (pitti)]

Thanks for the updates! Another round, then this should be perfect.

review: Needs Fixing

[lp:~brian-murray/apport/support-ppa-packages]

2983. By Brian Murray on 2015-07-08

make testing for gpg keys less fragile

2984. By Brian Murray on 2015-07-08

address pitti's feedback and simplify how using origins is specified

[Brian Murray (brian-murray)]

Okay, I think I've addressed everything, except for your concern regarding sources.list entries which I've commented on in-line.

[Martin Pitt (pitti)]

Responding to sources.list parsing.

[Martin Pitt (pitti)]

Some tiny nitpicks left, which I'd also be happy to do myself during merge. Do you want to change the sources.list parsing as discussed? If not I'm okay with leaving it like that and cleaning this up in a separate MP. Thanks!

[lp:~brian-murray/apport/support-ppa-packages]

2985. By Brian Murray on 2015-07-13

address final nitpicks

[Brian Murray (brian-murray)]

I've fixed the nitpicks and would prefer to sort out the sources.list parsing in a separate merge proposal.

[Martin Pitt (pitti)]

The last commit changed the wrong len(components), I fixed that and added a NEWS entry.

The tests fail with PYTHON=python2, with this:

======================================================================
ERROR: test_create_sources_for_a_named_ppa (__main__.T)
Add sources.list entries for a named PPA.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "test/test_backend_apt_dpkg.py", line 987, in test_create_sources_for_a_named_ppa
    'ubuntu', 'trusty', origins=[ppa])
  File "backends/packaging-apt-dpkg.py", line 1368, in _build_apt_sandbox
    ppa_info = apport.packaging.json_request(ppa_archive_url)
  File "/home/martin/ubuntu/apport/trunk/apport/packaging_impl.py", line 284, in json_request
    return json.loads(content)
  File "/usr/lib/python2.7/json/__init__.py", line 338, in loads
    return _default_decoder.decode(s)
  File "/usr/lib/python2.7/json/decoder.py", line 366, in decode
    obj, end = self.raw_decode(s, idx=_w(s, 0).end())
  File "/usr/lib/python2.7/json/decoder.py", line 384, in raw_decode
    raise ValueError("No JSON object could be decoded")
ValueError: No JSON object could be decoded

I checked json_request, and content == "Object: <Person at 0x2b0b217fc8d0 daisy (Daisy Bachmann)>, name: u'+archive'" which is indeed not JSON.

In the "good" python 3 case the URL is https//api.launchpad.net/devel/~daisy-pluckers/+archive/ubuntu/daisy-seeds, in the "bad" python 2 case it is https://api.launchpad.net/devel/~daisy/+archive/ubuntu/pluckers-daisy-seeds, which is obviously scrambled.

This is indeed weird:

$ python3 -c 'from urllib.request import urlopen; print(urlopen("https://api.launchpad.net/devel
/~daisy/+archive/ubuntu/pluckers-daisy-seeds").read())'
[...]
urllib.error.HTTPError: HTTP Error 404: Not Found

$ python -c 'from urllib import urlopen; print(urlopen("https://api.launchpad.net/devel/~daisy/+archive/ubuntu/pluckers-daisy-seeds").read())'
Object: <Person at 0x2b4df96bcbd0 daisy (Daisy Bachmann)>, name: u'+archive'

However, .getcode() says "404" in python 2, so this needs to be checked separately. I added that now.

There is one failure left with Python 2:

======================================================================
ERROR: test_use_sources_for_a_ppa (__main__.T)
Use a sources.list.d file for a PPA.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "test/test_backend_apt_dpkg.py", line 1028, in test_use_sources_for_a_ppa
    'ubuntu', 'trusty', origins=['LP-PPA-%s' % ppa])
  File "backends/packaging-apt-dpkg.py", line 1372, in _build_apt_sandbox
    ppa_info = apport.packaging.json_request(ppa_archive_url)
  File "/home/martin/ubuntu/apport/trunk/apport/packaging_impl.py", line 282, in json_request
    return json.loads(content)
  File "/usr/lib/python2.7/json/__init__.py", line 338, in loads
    return _default_decoder.decode(s)
  File "/usr/lib/python2.7/json/decoder.py", line 366, in decode
    obj, end = self.raw_decode(s, idx=_w(s, 0).end())
  File "/usr/lib/python2.7/json/decoder.py", line 384, in raw_decode
    raise ValueError("No JSON object could be decoded")
Valu...

review: Approve

=== modified file 'AUTHORS'
--- AUTHORS	2011-11-09 08:40:10 +0000
+++ AUTHORS	2015-07-13 22:32:23 +0000
@@ -1,7 +1,7 @@
 Copyright:
 ---------
 General:
-  Copyright (C) 2006 - 2011 Canonical Ltd.
+  Copyright (C) 2006 - 2015 Canonical Ltd.
 
 backends/packaging_rpm.py:
   Copyright (C) 2007 Red Hat Inc.
@@ -32,3 +32,6 @@
 
 Kees Cook <[e-mail]>:
   Various fixes, additional GDB output, SEGV parser.
+
+Brian Murray <[e-mail]>:
+  Various fixes, installation of packages from Launchpad and PPAs.

=== modified file 'apport/packaging.py'
--- apport/packaging.py	2015-07-02 16:13:23 +0000
+++ apport/packaging.py	2015-07-13 22:32:23 +0000
@@ -192,7 +192,8 @@
 
     def install_packages(self, rootdir, configdir, release, packages,
                          verbose=False, cache_dir=None,
-                         permanent_rootdir=False, architecture=None):
+                         permanent_rootdir=False, architecture=None,
+                         origins=None):
         '''Install packages into a sandbox (for apport-retrace).
 
         In order to work without any special permissions and without touching
@@ -221,6 +222,9 @@
         the given architecture (as specified in a report's "Architecture"
         field). If not given it defaults to the host system's architecture.
 
+        If origins is given, the sandbox will be created with apt data sources
+        for foreign origins.
+
         Return a string with outdated packages, or None if all packages were
         installed.
 

=== modified file 'apport/sandboxutils.py'
--- apport/sandboxutils.py	2015-06-11 05:49:39 +0000
+++ apport/sandboxutils.py	2015-07-13 22:32:23 +0000
@@ -10,7 +10,7 @@
 # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
 # the full text of the license.
 
-import atexit, os, os.path, shutil, tempfile
+import atexit, os, os.path, re, shutil, tempfile
 import apport
 
 
@@ -103,7 +103,8 @@
 
 
 def make_sandbox(report, config_dir, cache_dir=None, sandbox_dir=None,
-                 extra_packages=[], verbose=False, log_timestamps=False):
+                 extra_packages=[], verbose=False, log_timestamps=False,
+                 dynamic_origins=False):
     '''Build a sandbox with the packages that belong to a particular report.
 
     This downloads and unpacks all packages from the report's Package and
@@ -140,8 +141,14 @@
     are not derived from the report.
 
     If verbose is True (False by default), this will write some additional
-    logging to stdout. If log_timestamps is True, these log messages will be
-    prefixed with the current time.
+    logging to stdout.
+
+    If log_timestamps is True, these log messages will be prefixed with the
+    current time.
+
+    If dynamic_origins is True (False by default), the sandbox will be built
+    with packages from foreign origins that appear in the report's
+    Packages:/Dependencies:.
 
     Return a tuple (sandbox_dir, cache_dir, outdated_msg).
     '''
@@ -179,12 +186,20 @@
     if config_dir == 'system':
         config_dir = None
 
+    origins = None
+    if dynamic_origins:
+        pkg_list = report.get('Package', '') + '\n' + report.get('Dependencies', '')
+        m = re.compile('\[origin: ([a-zA-Z0-9][a-zA-Z0-9\+\.\-]+)\]')
+        origins = set(m.findall(pkg_list))
+        if origins:
+            apport.log("Origins: %s" % origins)
+
     # unpack packages, if any, using cache and sandbox
     try:
         outdated_msg = apport.packaging.install_packages(
             sandbox_dir, config_dir, report['DistroRelease'], pkgs,
             verbose, cache_dir, permanent_rootdir,
-            architecture=report.get('Architecture'))
+            architecture=report.get('Architecture'), origins=origins)
     except SystemError as e:
         apport.fatal(str(e))
 
@@ -210,7 +225,7 @@
             outdated_msg += apport.packaging.install_packages(
                 sandbox_dir, config_dir, report['DistroRelease'], pkgs,
                 verbose, cache_dir, permanent_rootdir,
-                architecture=report.get('Architecture'))
+                architecture=report.get('Architecture'), origins=origins)
         except SystemError as e:
             apport.fatal(str(e))
 

=== modified file 'backends/packaging-apt-dpkg.py'
--- backends/packaging-apt-dpkg.py	2015-07-02 16:13:23 +0000
+++ backends/packaging-apt-dpkg.py	2015-07-13 22:32:23 +0000
@@ -16,6 +16,8 @@
 import hashlib
 import json
 
+from contextlib import closing
+
 import warnings
 warnings.filterwarnings('ignore', 'apt API not stable yet', FutureWarning)
 import apt
@@ -24,9 +26,10 @@
     from urllib import urlopen, quote, unquote
     (pickle, urlopen, quote, unquote)  # pyflakes
     URLError = IOError
+    HTTPError = IOError
 except ImportError:
     # python 3
-    from urllib.error import URLError
+    from urllib.error import URLError, HTTPError
     from urllib.request import urlopen
     from urllib.parse import quote, unquote
     import pickle
@@ -47,6 +50,7 @@
         self._virtual_mapping_obj = None
         self._launchpad_base = 'https://api.launchpad.net/devel'
         self._archive_url = self._launchpad_base + '/%s/main_archive'
+        self._ppa_archive_url = self._launchpad_base + '/~%(user)s/+archive/%(distro)s/%(ppaname)s'
 
     def __del__(self):
         try:
@@ -88,14 +92,15 @@
                 self._apt_cache = apt.Cache(rootdir='/')
         return self._apt_cache
 
-    def _sandbox_cache(self, aptroot, apt_sources, fetchProgress):
+    def _sandbox_cache(self, aptroot, apt_sources, fetchProgress, distro_name, release_codename, origins):
         '''Build apt sandbox and return apt.Cache(rootdir=) (initialized lazily).
 
         Clear the package selection on subsequent calls.
         '''
         self._apt_cache = None
         if not self._sandbox_apt_cache:
-            self._build_apt_sandbox(aptroot, apt_sources)
+            self._build_apt_sandbox(aptroot, apt_sources, distro_name,
+                                    release_codename, origins)
             rootdir = os.path.abspath(aptroot)
             self._sandbox_apt_cache = apt.Cache(rootdir=rootdir)
             try:
@@ -660,7 +665,8 @@
 
     def install_packages(self, rootdir, configdir, release, packages,
                          verbose=False, cache_dir=None,
-                         permanent_rootdir=False, architecture=None):
+                         permanent_rootdir=False, architecture=None,
+                         origins=None):
         '''Install packages into a sandbox (for apport-retrace).
 
         In order to work without any special permissions and without touching
@@ -689,6 +695,9 @@
         the given architecture (as specified in a report's "Architecture"
         field). If not given it defaults to the host system's architecture.
 
+        If origins is given, the sandbox will be created with apt data sources
+        for foreign origins.
+
         Return a string with outdated packages, or None if all packages were
         installed.
 
@@ -747,9 +756,14 @@
         else:
             fetchProgress = apt.progress.base.AcquireProgress()
         if not tmp_aptroot:
-            cache = self._sandbox_cache(aptroot, apt_sources, fetchProgress)
+            cache = self._sandbox_cache(aptroot, apt_sources, fetchProgress,
+                                        self.get_distro_name(),
+                                        self.current_release_codename,
+                                        origins)
         else:
-            self._build_apt_sandbox(aptroot, apt_sources)
+            self._build_apt_sandbox(aptroot, apt_sources,
+                                    self.get_distro_name(),
+                                    self.current_release_codename, origins)
             cache = apt.Cache(rootdir=os.path.abspath(aptroot))
             try:
                 cache.update(fetchProgress)
@@ -1203,7 +1217,67 @@
         return None
 
     @classmethod
-    def _build_apt_sandbox(klass, apt_root, apt_sources):
+    def create_ppa_source_from_origin(klass, origin, distro, release_codename):
+        '''For an origin from a Launchpad PPA create sources.list content.
+
+        distro is the distribution for which content is being created e.g.
+        ubuntu.
+
+        release_codename is the codename of the release for which content is
+        being created e.g. trusty.
+
+        Return a string containing content suitable for writing to a sources.list
+        file, or None if the origin is not a Launchpad PPA.
+        '''
+
+        if origin.startswith("LP-PPA-"):
+            components = origin.split("-")[2:]
+            # If the PPA is unnamed, it will not appear in origin information
+            # but is named ppa in Launchpad.
+            try_ppa = True
+            if len(components) == 1:
+                components.append('ppa')
+                try_ppa = False
+
+            index = 1
+            while components[index:]:
+                # For an origin we can't tell where the user name ends and the
+                # PPA name starts, so split on each "-" until we find a PPA
+                # that exists.
+                user = str.join('-', components[0:index])
+                ppa_name = str.join('-', components[index:len(components)])
+                try:
+                    with closing(urlopen(apport.packaging._ppa_archive_url %
+                                         {'user': user, 'distro': distro,
+                                          'ppaname': ppa_name})) as response:
+                        response.read()
+                except (URLError, HTTPError):
+                    index += 1
+                    if index == len(components):
+                        if try_ppa:
+                            components.append('ppa')
+                            try_ppa = False
+                            index = 2
+                        else:
+                            user = None
+                    continue
+                break
+            if user and ppa_name:
+                ppa_line = 'deb http://ppa.launchpad.net/%s/%s/%s %s main' % \
+                           (user, ppa_name, distro, release_codename)
+                debug_url = 'http://ppa.launchpad.net/%s/%s/%s/dists/%s/main/debug' % \
+                            (user, ppa_name, distro, release_codename)
+                try:
+                    with closing(urlopen(debug_url)) as response:
+                        response.read()
+                    add_debug = ' main/debug'
+                except (URLError, HTTPError):
+                    add_debug = ''
+                return ppa_line + add_debug + '\ndeb-src' + ppa_line[3:] + '\n'
+        return None
+
+    @classmethod
+    def _build_apt_sandbox(klass, apt_root, apt_sources, distro_name, release_codename, origins):
         # pre-create directories, to avoid apt.Cache() printing "creating..."
         # messages on stdout
         if not os.path.exists(os.path.join(apt_root, 'var', 'lib', 'apt')):
@@ -1225,6 +1299,46 @@
             with open(os.path.join(apt_root, 'etc', 'apt', 'sources.list'), 'w') as dest:
                 dest.write(src.read())
 
+        if origins:
+            source_list_content = ''
+            # map an origin to a Launchpad username and PPA name
+            origin_data = {}
+            for origin in origins:
+                # apport's report format uses unknown for packages w/o an origin
+                if origin == 'unknown':
+                    continue
+                origin_path = None
+                if os.path.isdir(apt_sources + '.d'):
+                    # check to see if there is a sources.list file for the origin,
+                    # if there isn't try using a sources.list file w/o LP-PPA-
+                    origin_path = os.path.join(apt_sources + '.d', origin + '.list')
+                    if not os.path.exists(origin_path) and 'LP-PPA' in origin:
+                        origin_path = os.path.join(apt_sources + '.d',
+                                                   origin.strip('LP-PPA-') + '.list')
+                        if not os.path.exists(origin_path):
+                            origin_path = None
+                    elif not os.path.exists(origin_path):
+                        origin_path = None
+                if origin_path:
+                    with open(origin_path) as src_ext:
+                        source_list_content = src_ext.read()
+                else:
+                    source_list_content = klass.create_ppa_source_from_origin(origin, distro_name, release_codename)
+                if source_list_content:
+                    with open(os.path.join(apt_root, 'etc', 'apt',
+                                           'sources.list.d', origin + '.list'), 'a') as dest:
+                        dest.write(source_list_content)
+                    for line in source_list_content.splitlines():
+                        if line.startswith('#'):
+                            continue
+                        if 'ppa.launchpad.net' not in line:
+                            continue
+                        user = line.split()[1].split('/')[3]
+                        ppa = line.split()[1].split('/')[4]
+                        origin_data[origin] = (user, ppa)
+                else:
+                    apport.warning("Could not find or create source config for %s" % origin)
+
         # install apt keyrings; prefer the ones from the config dir, fall back
         # to system
         trusted_gpg = os.path.join(os.path.dirname(apt_sources), 'trusted.gpg')
@@ -1244,6 +1358,36 @@
         else:
             os.makedirs(trusted_d)
 
+        # install apt keyrings for PPAs
+        if origins and source_list_content:
+            for origin, (ppa_user, ppa_name) in origin_data.items():
+                ppa_archive_url = apport.packaging._ppa_archive_url % \
+                    {'user': quote(ppa_user), 'distro': distro_name,
+                     'ppaname': quote(ppa_name)}
+                ppa_info = apport.packaging.json_request(ppa_archive_url)
+                if not ppa_info:
+                    continue
+                try:
+                    signing_key_fingerprint = ppa_info['signing_key_fingerprint']
+                except IndexError:
+                    apport.warning("Error: can't find signing_key_fingerprint at %s"
+                                   % ppa_archive_url)
+                    continue
+                argv = ['gpg', '--no-options',
+                        '--no-default-keyring',
+                        '--no-auto-check-trustdb',
+                        '--keyring',
+                        os.path.join(trusted_d,
+                                     '%s.gpg' % origin),
+                        ]
+                argv += ['--quiet', '--batch',
+                         '--keyserver', 'hkp://keyserver.ubuntu.com:80/',
+                         '--recv', signing_key_fingerprint]
+                if subprocess.call(argv) != 0:
+                    apport.warning('Unable to import key for %s' %
+                                   ppa_archive_url)
+                    pass
+
     @classmethod
     def _deb_version(klass, pkg):
         '''Return the version of a .deb file'''

=== modified file 'bin/apport-retrace'
--- bin/apport-retrace	2015-05-29 21:53:42 +0000
+++ bin/apport-retrace	2015-07-13 22:32:23 +0000
@@ -53,6 +53,8 @@
                            help=_('Report download/install progress when installing packages into sandbox'))
     argparser.add_argument('--timestamps', action='store_true',
                            help=_('Prepend timestamps to log messages, for batch operation'))
+    argparser.add_argument('--dynamic-origins', action='store_true',
+                           help=_('Create and use third-party repositories from origins specified in reports'))
     argparser.add_argument('-C', '--cache', metavar='DIR',
                            help=_('Cache directory for packages downloaded in the sandbox'))
     argparser.add_argument('--sandbox-dir', metavar='DIR',
@@ -295,7 +297,8 @@
 if options.sandbox:
     sandbox, cache, outdated_msg = apport.sandboxutils.make_sandbox(
         report, options.sandbox, options.cache, options.sandbox_dir,
-        options.extra_package, options.verbose)
+        options.extra_package, options.verbose, log_timestamps,
+        options.dynamic_origins)
 else:
     sandbox = None
     outdated_msg = None

=== modified file 'test/test_backend_apt_dpkg.py'
--- test/test_backend_apt_dpkg.py	2015-06-29 13:31:02 +0000
+++ test/test_backend_apt_dpkg.py	2015-07-13 22:32:23 +0000
@@ -953,7 +953,8 @@
         self._setup_foonux_config()
         out_dir = os.path.join(self.workdir, 'out')
         os.mkdir(out_dir)
-        impl._build_apt_sandbox(self.rootdir, os.path.join(self.configdir, 'Foonux 1.2', 'sources.list'))
+        impl._build_apt_sandbox(self.rootdir, os.path.join(self.configdir, 'Foonux 1.2', 'sources.list'),
+                                'ubuntu', 'trusty', origins=None)
         res = impl.get_source_tree('base-files', out_dir, sandbox=self.rootdir,
                                    apt_update=True)
         self.assertTrue(os.path.isdir(os.path.join(res, 'debian')))
@@ -967,7 +968,8 @@
         self._setup_foonux_config()
         out_dir = os.path.join(self.workdir, 'out')
         os.mkdir(out_dir)
-        impl._build_apt_sandbox(self.rootdir, os.path.join(self.configdir, 'Foonux 1.2', 'sources.list'))
+        impl._build_apt_sandbox(self.rootdir, os.path.join(self.configdir, 'Foonux 1.2', 'sources.list'),
+                                'ubuntu', 'trusty', origins=None)
         res = impl.get_source_tree('debian-installer', out_dir, version='20101020ubuntu318.16',
                                    sandbox=self.rootdir, apt_update=True)
         self.assertTrue(os.path.isdir(os.path.join(res, 'debian')))
@@ -976,8 +978,86 @@
         self.assertTrue(res.endswith('/debian-installer-20101020ubuntu318.16'),
                         'unexpected version: ' + res.split('/')[-1])
 
-    def _setup_foonux_config(self, updates=False, release='trusty'):
-        '''Set up directories and configuration for install_packages()'''
+    @unittest.skipUnless(_has_internet(), 'online test')
+    def test_create_sources_for_a_named_ppa(self):
+        '''Add sources.list entries for a named PPA.'''
+        ppa = 'LP-PPA-daisy-pluckers-daisy-seeds'
+        self._setup_foonux_config()
+        impl._build_apt_sandbox(self.rootdir, os.path.join(self.configdir, 'Foonux 1.2', 'sources.list'),
+                                'ubuntu', 'trusty', origins=[ppa])
+        with open(os.path.join(self.rootdir, 'etc', 'apt', 'sources.list.d', ppa + '.list')) as f:
+            sources = f.read().splitlines()
+        self.assertIn('deb http://ppa.launchpad.net/daisy-pluckers/daisy-seeds/ubuntu trusty main main/debug', sources)
+        self.assertIn('deb-src http://ppa.launchpad.net/daisy-pluckers/daisy-seeds/ubuntu trusty main', sources)
+
+        d = subprocess.Popen(['gpg', '--no-options', '--no-default-keyring',
+                              '--no-auto-check-trustdb', '--trust-model',
+                              'always', '--batch', '--list-keys', '--keyring',
+                              os.path.join(self.rootdir, 'etc', 'apt', 'trusted.gpg.d', 'LP-PPA-daisy-pluckers-daisy-seeds.gpg')],
+                             stdout=subprocess.PIPE)
+        apt_keys = d.communicate()[0].decode()
+        assert d.returncode == 0
+        self.assertIn('Launchpad PPA for Daisy Pluckers', apt_keys)
+
+    @unittest.skipUnless(_has_internet(), 'online test')
+    def test_create_sources_for_an_unnamed_ppa(self):
+        '''Add sources.list entries for an unnamed PPA.'''
+        ppa = 'LP-PPA-brian-murray'
+        self._setup_foonux_config()
+        impl._build_apt_sandbox(self.rootdir, os.path.join(self.configdir, 'Foonux 1.2', 'sources.list'),
+                                'ubuntu', 'trusty', origins=[ppa])
+        with open(os.path.join(self.rootdir, 'etc', 'apt', 'sources.list.d', ppa + '.list')) as f:
+            sources = f.read().splitlines()
+        self.assertIn('deb http://ppa.launchpad.net/brian-murray/ppa/ubuntu trusty main', sources)
+        self.assertIn('deb-src http://ppa.launchpad.net/brian-murray/ppa/ubuntu trusty main', sources)
+
+        d = subprocess.Popen(['gpg', '--no-options', '--no-default-keyring',
+                              '--no-auto-check-trustdb', '--trust-model',
+                              'always', '--batch', '--list-keys', '--keyring',
+                              os.path.join(self.rootdir, 'etc', 'apt', 'trusted.gpg.d', 'LP-PPA-brian-murray.gpg')],
+                             stdout=subprocess.PIPE)
+        apt_keys = d.communicate()[0].decode()
+        assert d.returncode == 0
+        self.assertIn('Launchpad PPA for Brian Murray', apt_keys)
+
+    def test_use_sources_for_a_ppa(self):
+        '''Use a sources.list.d file for a PPA.'''
+        ppa = 'fooser-bar-ppa'
+        self._setup_foonux_config(ppa=True)
+        impl._build_apt_sandbox(self.rootdir, os.path.join(self.configdir, 'Foonux 1.2', 'sources.list'),
+                                'ubuntu', 'trusty', origins=['LP-PPA-%s' % ppa])
+        with open(os.path.join(self.rootdir, 'etc', 'apt', 'sources.list.d', ppa + '.list')) as f:
+            sources = f.read().splitlines()
+        self.assertIn('deb http://ppa.launchpad.net/fooser/bar-ppa/ubuntu trusty main main/debug', sources)
+        self.assertIn('deb-src http://ppa.launchpad.net/fooser/bar-ppa/ubuntu trusty main', sources)
+
+    @unittest.skipUnless(_has_internet(), 'online test')
+    def test_install_package_from_a_ppa(self):
+        '''Install a package from a PPA.'''
+        ppa = 'LP-PPA-brian-murray'
+        self._setup_foonux_config()
+        obsolete = impl.install_packages(self.rootdir, self.configdir, 'Foonux 1.2',
+                                         [('apport',
+                                           '2.14.1-0ubuntu3.7~ppa4')
+                                         ], False, self.cachedir, origins=[ppa])
+
+        self.assertEqual(obsolete, '')
+
+        def sandbox_ver(pkg):
+            with gzip.open(os.path.join(self.rootdir, 'usr/share/doc', pkg,
+                                        'changelog.Debian.gz')) as f:
+                return f.readline().decode().split()[1][1:-1]
+
+        self.assertEqual(sandbox_ver('apport'),
+                         '2.14.1-0ubuntu3.7~ppa4')
+
+    def _setup_foonux_config(self, updates=False, release='trusty', ppa=False):
+        '''Set up directories and configuration for install_packages()
+
+           If ppa is True, then a sources.list file for a PPA will be created
+           in sources.list.d used to test copying of a sources.list file to a
+           sandbox.
+        '''
 
         self.cachedir = os.path.join(self.workdir, 'cache')
         self.rootdir = os.path.join(self.workdir, 'root')
@@ -994,6 +1074,11 @@
                 f.write('deb http://archive.ubuntu.com/ubuntu/ %s-updates main\n' % release)
                 f.write('deb-src http://archive.ubuntu.com/ubuntu/ %s-updates main\n' % release)
                 f.write('deb http://ddebs.ubuntu.com/ %s-updates main\n' % release)
+        if ppa:
+            os.mkdir(os.path.join(self.configdir, 'Foonux 1.2', 'sources.list.d'))
+            with open(os.path.join(self.configdir, 'Foonux 1.2', 'sources.list.d', 'fooser-bar-ppa.list'), 'w') as f:
+                f.write('deb http://ppa.launchpad.net/fooser/bar-ppa/ubuntu %s main main/debug\n' % release)
+                f.write('deb-src http://ppa.launchpad.net/fooser/bar-ppa/ubuntu %s main\n' % release)
         os.mkdir(os.path.join(self.configdir, 'Foonux 1.2', 'armhf'))
         with open(os.path.join(self.configdir, 'Foonux 1.2', 'armhf', 'sources.list'), 'w') as f:
             f.write('deb http://ports.ubuntu.com/ %s main\n' % release)