From cca640d332eb8a6b068033a28b0b319873c7fbf6 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Thu, 12 May 2016 09:21:50 +0200
Subject: allow to add keys without specifying a source

---
 cloudinit/config/cc_apt_configure.py | 42 ++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 16 deletions(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 702977cb..1d3eddff 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -164,6 +164,29 @@ def generate_sources_list(codename, mirrors, cloud, log):
     templater.render_to_file(template_fn, '/etc/apt/sources.list', params)
 
 
+def add_key(ent, errorlist):
+    """
+    add key to the system as defiend in entry (if any)
+    suppords raw keys or keyid's
+    The latter will as a first step fetched to get the raw key
+    """
+    if ('keyid' in ent and 'key' not in ent):
+        keyserver = "keyserver.ubuntu.com"
+        if 'keyserver' in ent:
+            keyserver = ent['keyserver']
+        try:
+            ent['key'] = getkeybyid(ent['keyid'], keyserver)
+        except:
+            errorlist.append([ent, "failed to get key from %s" % keyserver])
+            return
+
+    if 'key' in ent:
+        try:
+            util.subp(('apt-key', 'add', '-'), ent['key'])
+        except:
+            errorlist.append([ent, "failed add key"])
+
+
 def add_sources(srclist, template_params=None, aa_repo_match=None):
     """
     add entries in /etc/apt/sources.list.d for each abbreviated
@@ -179,6 +202,9 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
 
     errorlist = []
     for ent in srclist:
+        # keys can be added without specifying a source
+        add_key(ent, errorlist)
+
         if 'source' not in ent:
             errorlist.append(["", "missing source"])
             continue
@@ -201,22 +227,6 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
             ent['filename'] = os.path.join("/etc/apt/sources.list.d/",
                                            ent['filename'])
 
-        if ('keyid' in ent and 'key' not in ent):
-            ks = "keyserver.ubuntu.com"
-            if 'keyserver' in ent:
-                ks = ent['keyserver']
-            try:
-                ent['key'] = getkeybyid(ent['keyid'], ks)
-            except:
-                errorlist.append([source, "failed to get key from %s" % ks])
-                continue
-
-        if 'key' in ent:
-            try:
-                util.subp(('apt-key', 'add', '-'), ent['key'])
-            except:
-                errorlist.append([source, "failed add key"])
-
         try:
             contents = "%s\n" % (source)
             util.write_file(ent['filename'], contents, omode="ab")
-- 
cgit v1.2.3


From 6fc583a4bcb49f7dbecdac095bc63e90dd6edaf3 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Thu, 12 May 2016 13:43:59 +0200
Subject: test mirror list with failing mirror

---
 cloudinit/config/cc_apt_configure.py               |  1 +
 .../test_handler_apt_configure_sources_list.py     | 23 ++++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 1d3eddff..ccbdcbc1 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -57,6 +57,7 @@ def handle(name, cfg, cloud, log, _args):
 
     release = get_release()
     mirrors = find_apt_mirror_info(cloud, cfg)
+    print(mirrors)
     if not mirrors or "primary" not in mirrors:
         log.debug(("Skipping module named %s,"
                    " no package 'mirror' located"), name)
diff --git a/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py b/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py
index aff272a3..bac2da24 100644
--- a/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py
+++ b/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py
@@ -58,14 +58,20 @@ class TestAptSourceConfigSourceList(t_help.FilesystemMockingTestCase):
 # TODO Later - custom template filename
 # TODO Later - custom template raw
 
-    def apt_source_list(self, distro, mirror):
+    def apt_source_list(self, distro, mirror, mirrorcheck=None):
         """ apt_source_list
         Test rendering of a source.list from template for a given distro
         """
         self.patchOS(self.new_root)
         self.patchUtils(self.new_root)
 
-        cfg = {'apt_mirror': mirror}
+        if mirrorcheck is None:
+            mirrorcheck = mirror
+
+        if isinstance(mirror, list):
+            cfg = {'apt_mirror_search': mirror}
+        else:
+            cfg = {'apt_mirror': mirror}
         mycloud = self._get_cloud(distro)
 
         with mock.patch.object(templater, 'render_to_file') as mocktmpl:
@@ -81,9 +87,9 @@ class TestAptSourceConfigSourceList(t_help.FilesystemMockingTestCase):
                                          '/etc/apt/sources.list',
                                          {'codename': '',
                                           'primary':
-                                          mirror,
+                                          mirrorcheck,
                                           'mirror':
-                                          mirror})
+                                          mirrorcheck})
 
 
     def test_apt_source_list_ubuntu(self):
@@ -100,4 +106,13 @@ class TestAptSourceConfigSourceList(t_help.FilesystemMockingTestCase):
         self.apt_source_list('debian', 'ftp.us.debian.org')
 
 
+    def test_apt_srcl_ubuntu_mirrorfail(self):
+        """ test_apt_source_list_ubuntu_mirrorfail
+        Test rendering of a source.list from template for ubuntu
+        """
+        self.apt_source_list('ubuntu', ['http://does.not.exist',
+                                        'http://archive.ubuntu.com/ubuntu/'],
+                             'http://archive.ubuntu.com/ubuntu/')
+
+
 # vi: ts=4 expandtab
-- 
cgit v1.2.3


From 18864f8e7331da359399decb1b080e36fa343f5a Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Thu, 12 May 2016 13:45:15 +0200
Subject: remove missed test print

---
 cloudinit/config/cc_apt_configure.py                             | 1 -
 .../test_handler/test_handler_apt_configure_sources_list.py      | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index ccbdcbc1..1d3eddff 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -57,7 +57,6 @@ def handle(name, cfg, cloud, log, _args):
 
     release = get_release()
     mirrors = find_apt_mirror_info(cloud, cfg)
-    print(mirrors)
     if not mirrors or "primary" not in mirrors:
         log.debug(("Skipping module named %s,"
                    " no package 'mirror' located"), name)
diff --git a/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py b/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py
index d48167c9..b8fe03ae 100644
--- a/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py
+++ b/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py
@@ -106,6 +106,15 @@ class TestAptSourceConfigSourceList(t_help.FilesystemMockingTestCase):
         self.apt_source_list('ubuntu', 'http://archive.ubuntu.com/ubuntu/')
 
 
+    def test_apt_srcl_debian_mirrorfail(self):
+        """ test_apt_source_list_debian_mirrorfail
+        Test rendering of a source.list from template for debian
+        """
+        self.apt_source_list('debian', ['http://does.not.exist',
+                                        'ftp.us.debian.org'],
+                             'ftp.us.debian.org')
+
+
     def test_apt_srcl_ubuntu_mirrorfail(self):
         """ test_apt_source_list_ubuntu_mirrorfail
         Test rendering of a source.list from template for ubuntu
-- 
cgit v1.2.3


From 0d8bf6f2c1464b5f4dab735841a50d02016d2caf Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Thu, 12 May 2016 15:51:21 +0200
Subject: add feature to allow a custom template for source list

---
 cloudinit/config/cc_apt_configure.py | 18 +++++++++++++-----
 cloudinit/templater.py               |  5 +++++
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 1d3eddff..2ab5e86c 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -21,6 +21,7 @@
 import glob
 import os
 import re
+import tempfile
 
 from cloudinit import templater
 from cloudinit import util
@@ -70,7 +71,7 @@ def handle(name, cfg, cloud, log, _args):
 
     if not util.get_cfg_option_bool(cfg,
                                     'apt_preserve_sources_list', False):
-        generate_sources_list(release, mirrors, cloud, log)
+        generate_sources_list(cfg, release, mirrors, cloud, log)
         old_mirrors = cfg.get('apt_old_mirrors',
                               {"primary": "archive.ubuntu.com/ubuntu",
                                "security": "security.ubuntu.com/ubuntu"})
@@ -149,7 +150,17 @@ def get_release():
     return stdout.strip()
 
 
-def generate_sources_list(codename, mirrors, cloud, log):
+def generate_sources_list(cfg, codename, mirrors, cloud, log):
+    params = {'codename': codename}
+    for k in mirrors:
+        params[k] = mirrors[k]
+
+    custtmpl = cfg.get('apt_custom_sources_list', None)
+    if custtmpl is not None:
+        templater.render_string_to_file(custtmpl,
+                                        '/etc/apt/sources.list', params)
+        return
+
     template_fn = cloud.get_template_filename('sources.list.%s' %
                                               (cloud.distro.name))
     if not template_fn:
@@ -158,9 +169,6 @@ def generate_sources_list(codename, mirrors, cloud, log):
             log.warn("No template found, not rendering /etc/apt/sources.list")
             return
 
-    params = {'codename': codename}
-    for k in mirrors:
-        params[k] = mirrors[k]
     templater.render_to_file(template_fn, '/etc/apt/sources.list', params)
 
 
diff --git a/cloudinit/templater.py b/cloudinit/templater.py
index a9231482..8a6ad417 100644
--- a/cloudinit/templater.py
+++ b/cloudinit/templater.py
@@ -142,6 +142,11 @@ def render_to_file(fn, outfn, params, mode=0o644):
     util.write_file(outfn, contents, mode=mode)
 
 
+def render_string_to_file(content, outfn, params, mode=0o644):
+    contents = render_string(content, params)
+    util.write_file(outfn, contents, mode=mode)
+
+
 def render_string(content, params):
     if not params:
         params = {}
-- 
cgit v1.2.3


From 9c6b5f54ad5b83131de6d997930bd9f4031e6a83 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Thu, 12 May 2016 19:50:01 +0200
Subject: move errorlist.append out of add_key

---
 cloudinit/config/cc_apt_configure.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 2ab5e86c..91d02815 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -172,7 +172,7 @@ def generate_sources_list(cfg, codename, mirrors, cloud, log):
     templater.render_to_file(template_fn, '/etc/apt/sources.list', params)
 
 
-def add_key(ent, errorlist):
+def add_key(ent):
     """
     add key to the system as defiend in entry (if any)
     suppords raw keys or keyid's
@@ -185,14 +185,13 @@ def add_key(ent, errorlist):
         try:
             ent['key'] = getkeybyid(ent['keyid'], keyserver)
         except:
-            errorlist.append([ent, "failed to get key from %s" % keyserver])
-            return
+            raise Exception('failed to get key from %s' % keyserver)
 
     if 'key' in ent:
         try:
             util.subp(('apt-key', 'add', '-'), ent['key'])
         except:
-            errorlist.append([ent, "failed add key"])
+            raise Exception('failed add key')
 
 
 def add_sources(srclist, template_params=None, aa_repo_match=None):
@@ -211,7 +210,10 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
     errorlist = []
     for ent in srclist:
         # keys can be added without specifying a source
-        add_key(ent, errorlist)
+        try:
+            add_key(ent)
+        except Exception as detail:
+            errorlist.append([ent, detail])
 
         if 'source' not in ent:
             errorlist.append(["", "missing source"])
-- 
cgit v1.2.3


From e55ccfa5670e16aa7431a193d0838aa7d04db4d5 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Thu, 12 May 2016 19:50:34 +0200
Subject: remove Unnecessary parens in add_key

---
 cloudinit/config/cc_apt_configure.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 91d02815..492c3c00 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -178,7 +178,7 @@ def add_key(ent):
     suppords raw keys or keyid's
     The latter will as a first step fetched to get the raw key
     """
-    if ('keyid' in ent and 'key' not in ent):
+    if 'keyid' in ent and 'key' not in ent:
         keyserver = "keyserver.ubuntu.com"
         if 'keyserver' in ent:
             keyserver = ent['keyserver']
-- 
cgit v1.2.3


From 53834934e4c520b2fb8b5acffca641213ddd688a Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Thu, 12 May 2016 20:29:33 +0200
Subject: fix EXPORT_GPG_KEYID for long key fingerprints

---
 cloudinit/config/cc_apt_configure.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 492c3c00..28f20939 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -43,7 +43,7 @@ EXPORT_GPG_KEYID = """
     [ -n "$k" ] || exit 1;
     armour=$(gpg --list-keys --armour "${k}")
     if [ -z "${armour}" ]; then
-       gpg --keyserver ${ks} --recv $k >/dev/null &&
+       gpg --keyserver ${ks} --recv "${k}" >/dev/null &&
           armour=$(gpg --export --armour "${k}") &&
           gpg --batch --yes --delete-keys "${k}"
     fi
-- 
cgit v1.2.3


From 2202494b72cae19cbf9d34a8f3176d7021becb13 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Thu, 12 May 2016 20:53:12 +0200
Subject: split add_key and add_key_raw fior better testability

---
 cloudinit/config/cc_apt_configure.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 28f20939..e7b8a9b3 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -171,10 +171,19 @@ def generate_sources_list(cfg, codename, mirrors, cloud, log):
 
     templater.render_to_file(template_fn, '/etc/apt/sources.list', params)
 
+def add_key_raw(key):
+    """
+    actual adding of a key as defined in key argument
+    to the system
+    """
+    try:
+        util.subp(('apt-key', 'add', '-'), key)
+    except:
+        raise Exception('failed add key')
 
 def add_key(ent):
     """
-    add key to the system as defiend in entry (if any)
+    add key to the system as defiend in ent (if any)
     suppords raw keys or keyid's
     The latter will as a first step fetched to get the raw key
     """
@@ -188,10 +197,7 @@ def add_key(ent):
             raise Exception('failed to get key from %s' % keyserver)
 
     if 'key' in ent:
-        try:
-            util.subp(('apt-key', 'add', '-'), ent['key'])
-        except:
-            raise Exception('failed add key')
+        add_key_raw(ent['key'])
 
 
 def add_sources(srclist, template_params=None, aa_repo_match=None):
-- 
cgit v1.2.3


From 454de24c7d457b980c91849b128efe4faee62032 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Thu, 12 May 2016 21:21:36 +0200
Subject: make pep8 happy with a few spaces

---
 cloudinit/config/cc_apt_configure.py                    | 2 ++
 tests/unittests/test_handler/test_handler_apt_source.py | 1 +
 2 files changed, 3 insertions(+)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index e7b8a9b3..e5a962ac 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -171,6 +171,7 @@ def generate_sources_list(cfg, codename, mirrors, cloud, log):
 
     templater.render_to_file(template_fn, '/etc/apt/sources.list', params)
 
+
 def add_key_raw(key):
     """
     actual adding of a key as defined in key argument
@@ -181,6 +182,7 @@ def add_key_raw(key):
     except:
         raise Exception('failed add key')
 
+
 def add_key(ent):
     """
     add key to the system as defiend in ent (if any)
diff --git a/tests/unittests/test_handler/test_handler_apt_source.py b/tests/unittests/test_handler/test_handler_apt_source.py
index 439bd038..e130392c 100644
--- a/tests/unittests/test_handler/test_handler_apt_source.py
+++ b/tests/unittests/test_handler/test_handler_apt_source.py
@@ -30,6 +30,7 @@ S0ORP6HXET3+jC8BMG4tBWCTK/XEZw==
 =ACB2
 -----END PGP PUBLIC KEY BLOCK-----"""
 
+
 def load_tfile_or_url(*args, **kwargs):
     """ load_tfile_or_url
     load file and return content after decoding
-- 
cgit v1.2.3


From ee239517c5342cbd62c9fdeaf735d78d6fd1fbb8 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Mon, 23 May 2016 11:59:14 +0200
Subject: support apt_sources to be a dictionary

key is the filename, and "old" input shall be handled as it was all the time.
For compatibility this will (continue to) overwrite the file of multiple
options that did not specify an output file (they all get the same default).
Yet it will process them all - as it always did - e.g. to add the keys of all
of them.

Any users of the new format won't have these issues, as they will always have
a key.
---
 cloudinit/config/cc_apt_configure.py | 34 +++++++++++++++++++++++++---------
 cloudinit/util.py                    |  8 ++++++++
 2 files changed, 33 insertions(+), 9 deletions(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index e5a962ac..a46ebb3e 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -215,8 +215,28 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
         def aa_repo_match(x):
             return False
 
+    # convert old list format to new dict based format
+    if isinstance(srclist, list):
+        srcdict = {}
+        for srcent in srclist:
+            if 'filename' not in srcent:
+                # file collides for multiple !filename cases for compatibility
+                # yet we need them all processed, so not same dictionary key
+                srcent['filename'] = "cloud_config_sources.list"
+                key = util.rand_dict_key(srcdict, "cloud_config_sources.list")
+            else:
+                # all with filename use that as key (matching new format)
+                key = srcent['filename']
+            srcdict[key] = srcent
+    else:
+        srcdict = srclist
+
     errorlist = []
-    for ent in srclist:
+    for filename in srcdict:
+        ent = srcdict[filename]
+        if 'filename' not in ent:
+            ent[filename] = filename
+
         # keys can be added without specifying a source
         try:
             add_key(ent)
@@ -226,10 +246,13 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
         if 'source' not in ent:
             errorlist.append(["", "missing source"])
             continue
-
         source = ent['source']
         source = templater.render_string(source, template_params)
 
+        if not ent['filename'].startswith("/"):
+            ent['filename'] = os.path.join("/etc/apt/sources.list.d/",
+                                           ent['filename'])
+
         if aa_repo_match(source):
             try:
                 util.subp(["add-apt-repository", source])
@@ -238,13 +261,6 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
                                   ("add-apt-repository failed. " + str(e))])
             continue
 
-        if 'filename' not in ent:
-            ent['filename'] = 'cloud_config_sources.list'
-
-        if not ent['filename'].startswith("/"):
-            ent['filename'] = os.path.join("/etc/apt/sources.list.d/",
-                                           ent['filename'])
-
         try:
             contents = "%s\n" % (source)
             util.write_file(ent['filename'], contents, omode="ab")
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 0d21e11b..2931efbd 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -335,6 +335,14 @@ def rand_str(strlen=32, select_from=None):
         select_from = string.ascii_letters + string.digits
     return "".join([random.choice(select_from) for _x in range(0, strlen)])
 
+def rand_dict_key(dictionary, postfix=None):
+    if not postfix:
+        postfix = ""
+    while True:
+        newkey = rand_str(strlen=8) + "_" + postfix
+        if newkey not in dictionary:
+            break
+    return newkey
 
 def read_conf(fname):
     try:
-- 
cgit v1.2.3


From a33f8c09863381006f708a1e9d49997ed9f7befa Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Mon, 23 May 2016 12:12:26 +0200
Subject: warn about multiple colliding apt_source without filenames

---
 cloudinit/config/cc_apt_configure.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index a46ebb3e..327b543e 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -215,15 +215,22 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
         def aa_repo_match(x):
             return False
 
+    errorlist = []
     # convert old list format to new dict based format
     if isinstance(srclist, list):
         srcdict = {}
+        fnfallbackused = None
         for srcent in srclist:
             if 'filename' not in srcent:
                 # file collides for multiple !filename cases for compatibility
                 # yet we need them all processed, so not same dictionary key
                 srcent['filename'] = "cloud_config_sources.list"
                 key = util.rand_dict_key(srcdict, "cloud_config_sources.list")
+                if fnfallbackused is not None:
+                    errorlist.append(["multiple apt_source entries without",
+                                      "filename will conflict: %s vs %s" %
+                                      (srcent, fnfallbackused)])
+                fnfallbackused = srcent
             else:
                 # all with filename use that as key (matching new format)
                 key = srcent['filename']
@@ -231,7 +238,6 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
     else:
         srcdict = srclist
 
-    errorlist = []
     for filename in srcdict:
         ent = srcdict[filename]
         if 'filename' not in ent:
-- 
cgit v1.2.3


From 4ed5251d17ee7a44ce12d38d9b3d4fa554279419 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Mon, 23 May 2016 15:06:48 +0200
Subject: fix issue with dictionary style apt_sources handling filenames

---
 cloudinit/config/cc_apt_configure.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 327b543e..a25d6af1 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -241,7 +241,7 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
     for filename in srcdict:
         ent = srcdict[filename]
         if 'filename' not in ent:
-            ent[filename] = filename
+            ent['filename'] = filename
 
         # keys can be added without specifying a source
         try:
-- 
cgit v1.2.3


From 2945e028477ddb031d9a51ada16d5b992380242a Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Mon, 23 May 2016 16:12:18 +0200
Subject: make sure we only handle list or dict apt_sources and bail out for
 others

---
 cloudinit/config/cc_apt_configure.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index a25d6af1..dd199471 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -217,8 +217,8 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
 
     errorlist = []
     # convert old list format to new dict based format
+    srcdict = {}
     if isinstance(srclist, list):
-        srcdict = {}
         fnfallbackused = None
         for srcent in srclist:
             if 'filename' not in srcent:
@@ -235,8 +235,10 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
                 # all with filename use that as key (matching new format)
                 key = srcent['filename']
             srcdict[key] = srcent
-    else:
+    elif isinstance(srclist, dict):
         srcdict = srclist
+    else:
+        errorlist.append(["srclist", "unknown apt_sources format"])
 
     for filename in srcdict:
         ent = srcdict[filename]
-- 
cgit v1.2.3


From a63a64a70def97730d2ab544b0df9f87f3484333 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Mon, 23 May 2016 16:53:03 +0200
Subject: final pep8 check fixups

---
 cloudinit/util.py                                       | 2 ++
 tests/unittests/test_handler/test_handler_apt_source.py | 9 +++------
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'cloudinit')

diff --git a/cloudinit/util.py b/cloudinit/util.py
index 2931efbd..0773af69 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -335,6 +335,7 @@ def rand_str(strlen=32, select_from=None):
         select_from = string.ascii_letters + string.digits
     return "".join([random.choice(select_from) for _x in range(0, strlen)])
 
+
 def rand_dict_key(dictionary, postfix=None):
     if not postfix:
         postfix = ""
@@ -344,6 +345,7 @@ def rand_dict_key(dictionary, postfix=None):
             break
     return newkey
 
+
 def read_conf(fname):
     try:
         return load_yaml(load_file(fname), default={})
diff --git a/tests/unittests/test_handler/test_handler_apt_source.py b/tests/unittests/test_handler/test_handler_apt_source.py
index 237cf14d..c19904fb 100644
--- a/tests/unittests/test_handler/test_handler_apt_source.py
+++ b/tests/unittests/test_handler/test_handler_apt_source.py
@@ -55,7 +55,6 @@ class TestAptSourceConfig(TestCase):
         self.fallbackfn = os.path.join(self.tmp, "etc/apt/sources.list.d/",
                                        "cloud_config_sources.list")
 
-
     @staticmethod
     def _get_default_params():
         """ get_default_params
@@ -68,9 +67,9 @@ class TestAptSourceConfig(TestCase):
 
     def myjoin(self, *args, **kwargs):
         """ myjoin - redir into writable tmpdir"""
-        if (args[0] == "/etc/apt/sources.list.d/"
-                and args[1] == "cloud_config_sources.list"
-                and len(args) == 2):
+        if (args[0] == "/etc/apt/sources.list.d/" and
+                args[1] == "cloud_config_sources.list" and
+                len(args) == 2):
             return self.join(self.tmp, args[0].lstrip("/"), args[1])
         else:
             return self.join(*args, **kwargs)
@@ -137,7 +136,6 @@ class TestAptSourceConfig(TestCase):
                                    "main universe multiverse restricted"),
                                   contents, flags=re.IGNORECASE))
 
-
     def test_apt_src_basic_tri(self):
         """ test_apt_src_basic_tri
         Test Fix three deb source string, has to overwrite mirror conf in
@@ -232,7 +230,6 @@ class TestAptSourceConfig(TestCase):
                                    "universe"),
                                   contents, flags=re.IGNORECASE))
 
-
     def test_apt_src_replace_tri(self):
         """ test_apt_src_replace_tri
         Test three autoreplacements of MIRROR and RELEASE in source specs with
-- 
cgit v1.2.3


From 2a20382249c35f368f931dc2bcd8225ea1fc4e84 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Tue, 24 May 2016 18:55:35 +0200
Subject: integrate further smaller review feedback

---
 cloudinit/config/cc_apt_configure.py | 52 +++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 25 deletions(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 8f22c446..02b16336 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -21,7 +21,6 @@
 import glob
 import os
 import re
-import tempfile
 
 from cloudinit import templater
 from cloudinit import util
@@ -179,44 +178,29 @@ def add_key_raw(key):
     """
     try:
         util.subp(('apt-key', 'add', '-'), key)
-    except:
+    except util.ProcessExecutionError:
         raise Exception('failed add key')
 
 
 def add_key(ent):
     """
-    add key to the system as defiend in ent (if any)
-    suppords raw keys or keyid's
-    The latter will as a first step fetched to get the raw key
+    add key to the system as defined in ent (if any)
+    supports raw keys or keyid's
+    The latter will as a first step fetch the raw key from a keyserver
     """
     if 'keyid' in ent and 'key' not in ent:
         keyserver = "keyserver.ubuntu.com"
         if 'keyserver' in ent:
             keyserver = ent['keyserver']
-        try:
-            ent['key'] = getkeybyid(ent['keyid'], keyserver)
-        except:
-            raise Exception('failed to get key from %s' % keyserver)
+        ent['key'] = getkeybyid(ent['keyid'], keyserver)
 
     if 'key' in ent:
         add_key_raw(ent['key'])
 
-
-def add_sources(srclist, template_params=None, aa_repo_match=None):
-    """
-    add entries in /etc/apt/sources.list.d for each abbreviated
-    sources.list entry in 'srclist'.  When rendering template, also
-    include the values in dictionary searchList
+def convert_to_new_format(srclist, errorlist):
+    """ convert_to_new_format
+        convert the old list based format to the new dict based one
     """
-    if template_params is None:
-        template_params = {}
-
-    if aa_repo_match is None:
-        def aa_repo_match(x):
-            return False
-
-    errorlist = []
-    # convert old list format to new dict based format
     srcdict = {}
     if isinstance(srclist, list):
         fnfallbackused = None
@@ -240,6 +224,24 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
     else:
         errorlist.append(["srclist", "unknown apt_sources format"])
 
+    return srcdict
+
+def add_sources(srclist, template_params=None, aa_repo_match=None):
+    """
+    add entries in /etc/apt/sources.list.d for each abbreviated
+    sources.list entry in 'srclist'.  When rendering template, also
+    include the values in dictionary searchList
+    """
+    if template_params is None:
+        template_params = {}
+
+    if aa_repo_match is None:
+        def aa_repo_match(x):
+            return False
+
+    errorlist = []
+    srcdict = convert_to_new_format(srclist, errorlist)
+
     for filename in srcdict:
         ent = srcdict[filename]
         if 'filename' not in ent:
@@ -257,7 +259,7 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
         source = ent['source']
         source = templater.render_string(source, template_params)
 
-        if not ent['filename'].startswith("/"):
+        if not ent['filename'].startswith(os.path.sep):
             ent['filename'] = os.path.join("/etc/apt/sources.list.d/",
                                            ent['filename'])
 
-- 
cgit v1.2.3


From c2cfbd6831912e6dfd6b16ed21afb929592ce51a Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Tue, 24 May 2016 19:06:55 +0200
Subject: pacify pep8 regarding the new changes

---
 cloudinit/config/cc_apt_configure.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 02b16336..ffbf7513 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -197,6 +197,7 @@ def add_key(ent):
     if 'key' in ent:
         add_key_raw(ent['key'])
 
+
 def convert_to_new_format(srclist, errorlist):
     """ convert_to_new_format
         convert the old list based format to the new dict based one
@@ -226,6 +227,7 @@ def convert_to_new_format(srclist, errorlist):
 
     return srcdict
 
+
 def add_sources(srclist, template_params=None, aa_repo_match=None):
     """
     add entries in /etc/apt/sources.list.d for each abbreviated
-- 
cgit v1.2.3


From aa236033b159b691f5ec31885750a8167c63b2a1 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Mon, 30 May 2016 12:27:40 +0200
Subject: drop errorlist from convert_to_new_format

---
 cloudinit/config/cc_apt_configure.py                    | 12 +++---------
 tests/unittests/test_handler/test_handler_apt_source.py |  6 ++----
 2 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index ffbf7513..2dd48844 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -198,24 +198,18 @@ def add_key(ent):
         add_key_raw(ent['key'])
 
 
-def convert_to_new_format(srclist, errorlist):
+def convert_to_new_format(srclist):
     """ convert_to_new_format
         convert the old list based format to the new dict based one
     """
     srcdict = {}
     if isinstance(srclist, list):
-        fnfallbackused = None
         for srcent in srclist:
             if 'filename' not in srcent:
                 # file collides for multiple !filename cases for compatibility
                 # yet we need them all processed, so not same dictionary key
                 srcent['filename'] = "cloud_config_sources.list"
                 key = util.rand_dict_key(srcdict, "cloud_config_sources.list")
-                if fnfallbackused is not None:
-                    errorlist.append(["multiple apt_source entries without",
-                                      "filename will conflict: %s vs %s" %
-                                      (srcent, fnfallbackused)])
-                fnfallbackused = srcent
             else:
                 # all with filename use that as key (matching new format)
                 key = srcent['filename']
@@ -223,7 +217,7 @@ def convert_to_new_format(srclist, errorlist):
     elif isinstance(srclist, dict):
         srcdict = srclist
     else:
-        errorlist.append(["srclist", "unknown apt_sources format"])
+        raise ValueError("unknown apt_sources format")
 
     return srcdict
 
@@ -242,7 +236,7 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
             return False
 
     errorlist = []
-    srcdict = convert_to_new_format(srclist, errorlist)
+    srcdict = convert_to_new_format(srclist)
 
     for filename in srcdict:
         ent = srcdict[filename]
diff --git a/tests/unittests/test_handler/test_handler_apt_source.py b/tests/unittests/test_handler/test_handler_apt_source.py
index 753e86a8..4536c5b2 100644
--- a/tests/unittests/test_handler/test_handler_apt_source.py
+++ b/tests/unittests/test_handler/test_handler_apt_source.py
@@ -529,7 +529,6 @@ class TestAptSourceConfig(TestCase):
                 'filename': self.aptlistfile2}
         cfg3 = {'source': 'deb $MIRROR $RELEASE universe',
                 'filename': self.aptlistfile3}
-        errorlist = []
         checkcfg = {self.aptlistfile: {'filename': self.aptlistfile,
                                        'source': 'deb $MIRROR $RELEASE '
                                                  'multiverse'},
@@ -539,11 +538,10 @@ class TestAptSourceConfig(TestCase):
                                         'source': 'deb $MIRROR $RELEASE '
                                                   'universe'}}
 
-        newcfg = cc_apt_configure.convert_to_new_format([cfg1, cfg2, cfg3],
-                                                        errorlist)
+        newcfg = cc_apt_configure.convert_to_new_format([cfg1, cfg2, cfg3])
         self.assertEqual(newcfg, checkcfg)
 
-        newcfg2 = cc_apt_configure.convert_to_new_format(newcfg, errorlist)
+        newcfg2 = cc_apt_configure.convert_to_new_format(newcfg)
         self.assertEqual(newcfg2, checkcfg)
 
 
-- 
cgit v1.2.3


From 3c85315373306729443ef79fd8e54af46a7bc849 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Mon, 30 May 2016 13:07:22 +0200
Subject: fix EXPORT_GPG_KEYID for existing keys

This was broken for keys already existing in the local keyring.
There instead of the keycontent it reported the header like:
 pub   1024R/03683F77 2009-10-27
 uid                  Launchpad PPA for Scott Moser
---
 cloudinit/config/cc_apt_configure.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 2dd48844..d603f417 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -40,7 +40,7 @@ EXPORT_GPG_KEYID = """
     k=${1} ks=${2};
     exec 2>/dev/null
     [ -n "$k" ] || exit 1;
-    armour=$(gpg --list-keys --armour "${k}")
+    armour=$(gpg --export --armour "${k}")
     if [ -z "${armour}" ]; then
        gpg --keyserver ${ks} --recv "${k}" >/dev/null &&
           armour=$(gpg --export --armour "${k}") &&
-- 
cgit v1.2.3


From 80931f7008971c9a7705c054fabc29fec7a133e2 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 3 Jun 2016 15:27:32 -0400
Subject: fix tox -e flake8

---
 cloudinit/config/cc_apt_configure.py               |  4 +-
 .../test_handler_apt_configure_sources_list.py     | 17 +++---
 .../test_handler/test_handler_apt_source.py        | 66 +++++++++++-----------
 3 files changed, 43 insertions(+), 44 deletions(-)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index d603f417..7a9777c0 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -199,8 +199,8 @@ def add_key(ent):
 
 
 def convert_to_new_format(srclist):
-    """ convert_to_new_format
-        convert the old list based format to the new dict based one
+    """convert_to_new_format
+       convert the old list based format to the new dict based one
     """
     srcdict = {}
     if isinstance(srclist, list):
diff --git a/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py b/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py
index 5cf386f8..5d0417a2 100644
--- a/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py
+++ b/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py
@@ -3,7 +3,6 @@ Test templating of sources list
 """
 import logging
 import os
-import re
 import shutil
 import tempfile
 
@@ -62,14 +61,14 @@ deb-src http://archive.ubuntu.com/ubuntu/ fakerelease main restricted
 
 
 def load_tfile_or_url(*args, **kwargs):
-    """ load_tfile_or_url
+    """load_tfile_or_url
     load file and return content after decoding
     """
     return util.decode_binary(util.read_file_or_url(*args, **kwargs).contents)
 
 
 class TestAptSourceConfigSourceList(t_help.FilesystemMockingTestCase):
-    """ TestAptSourceConfigSourceList
+    """TestAptSourceConfigSourceList
     Main Class to test sources list rendering
     """
     def setUp(self):
@@ -89,7 +88,7 @@ class TestAptSourceConfigSourceList(t_help.FilesystemMockingTestCase):
         return cloud.Cloud(myds, paths, {}, mydist, None)
 
     def apt_source_list(self, distro, mirror, mirrorcheck=None):
-        """ apt_source_list
+        """apt_source_list
         Test rendering of a source.list from template for a given distro
         """
         if mirrorcheck is None:
@@ -115,19 +114,19 @@ class TestAptSourceConfigSourceList(t_help.FilesystemMockingTestCase):
             {'codename': '', 'primary': mirrorcheck, 'mirror': mirrorcheck})
 
     def test_apt_source_list_debian(self):
-        """ test_apt_source_list_debian
+        """test_apt_source_list_debian
         Test rendering of a source.list from template for debian
         """
         self.apt_source_list('debian', 'http://httpredir.debian.org/debian')
 
     def test_apt_source_list_ubuntu(self):
-        """ test_apt_source_list_ubuntu
+        """test_apt_source_list_ubuntu
         Test rendering of a source.list from template for ubuntu
         """
         self.apt_source_list('ubuntu', 'http://archive.ubuntu.com/ubuntu/')
 
     def test_apt_srcl_debian_mirrorfail(self):
-        """ test_apt_source_list_debian_mirrorfail
+        """test_apt_source_list_debian_mirrorfail
         Test rendering of a source.list from template for debian
         """
         self.apt_source_list('debian', ['http://does.not.exist',
@@ -135,7 +134,7 @@ class TestAptSourceConfigSourceList(t_help.FilesystemMockingTestCase):
                              'http://httpredir.debian.org/debian')
 
     def test_apt_srcl_ubuntu_mirrorfail(self):
-        """ test_apt_source_list_ubuntu_mirrorfail
+        """test_apt_source_list_ubuntu_mirrorfail
         Test rendering of a source.list from template for ubuntu
         """
         self.apt_source_list('ubuntu', ['http://does.not.exist',
@@ -143,7 +142,7 @@ class TestAptSourceConfigSourceList(t_help.FilesystemMockingTestCase):
                              'http://archive.ubuntu.com/ubuntu/')
 
     def test_apt_srcl_custom(self):
-        """ test_apt_srcl_custom
+        """test_apt_srcl_custom
         Test rendering from a custom source.list template
         """
         cfg = util.load_yaml(YAML_TEXT_CUSTOM_SL)
diff --git a/tests/unittests/test_handler/test_handler_apt_source.py b/tests/unittests/test_handler/test_handler_apt_source.py
index fe2ffae5..4dbe69f0 100644
--- a/tests/unittests/test_handler/test_handler_apt_source.py
+++ b/tests/unittests/test_handler/test_handler_apt_source.py
@@ -33,14 +33,14 @@ S0ORP6HXET3+jC8BMG4tBWCTK/XEZw==
 
 
 def load_tfile_or_url(*args, **kwargs):
-    """ load_tfile_or_url
+    """load_tfile_or_url
     load file and return content after decoding
     """
     return util.decode_binary(util.read_file_or_url(*args, **kwargs).contents)
 
 
 class TestAptSourceConfig(TestCase):
-    """ TestAptSourceConfig
+    """TestAptSourceConfig
     Main Class to test apt_source configs
     """
     def setUp(self):
@@ -57,7 +57,7 @@ class TestAptSourceConfig(TestCase):
 
     @staticmethod
     def _get_default_params():
-        """ get_default_params
+        """get_default_params
         Get the most basic default mrror and release info to be used in tests
         """
         params = {}
@@ -66,7 +66,7 @@ class TestAptSourceConfig(TestCase):
         return params
 
     def myjoin(self, *args, **kwargs):
-        """ myjoin - redir into writable tmpdir"""
+        """myjoin - redir into writable tmpdir"""
         if (args[0] == "/etc/apt/sources.list.d/" and
                 args[1] == "cloud_config_sources.list" and
                 len(args) == 2):
@@ -75,7 +75,7 @@ class TestAptSourceConfig(TestCase):
             return self.join(*args, **kwargs)
 
     def apt_src_basic(self, filename, cfg):
-        """ apt_src_basic
+        """apt_src_basic
         Test Fix deb source string, has to overwrite mirror conf in params
         """
         params = self._get_default_params()
@@ -92,7 +92,7 @@ class TestAptSourceConfig(TestCase):
                                   contents, flags=re.IGNORECASE))
 
     def test_apt_src_basic(self):
-        """ test_apt_src_basic
+        """test_apt_src_basic
         Test Fix deb source string, has to overwrite mirror conf in params.
         Test with a filename provided in config.
         """
@@ -103,7 +103,7 @@ class TestAptSourceConfig(TestCase):
         self.apt_src_basic(self.aptlistfile, [cfg])
 
     def test_apt_src_basic_dict(self):
-        """ test_apt_src_basic_dict
+        """test_apt_src_basic_dict
         Test Fix deb source string, has to overwrite mirror conf in params.
         Test with a filename provided in config.
         Provided in a dictionary with filename being the key (new format)
@@ -115,7 +115,7 @@ class TestAptSourceConfig(TestCase):
         self.apt_src_basic(self.aptlistfile, cfg)
 
     def apt_src_basic_tri(self, cfg):
-        """ apt_src_basic_tri
+        """apt_src_basic_tri
         Test Fix three deb source string, has to overwrite mirror conf in
         params. Test with filenames provided in config.
         generic part to check three files with different content
@@ -137,7 +137,7 @@ class TestAptSourceConfig(TestCase):
                                   contents, flags=re.IGNORECASE))
 
     def test_apt_src_basic_tri(self):
-        """ test_apt_src_basic_tri
+        """test_apt_src_basic_tri
         Test Fix three deb source string, has to overwrite mirror conf in
         params. Test with filenames provided in config.
         """
@@ -156,7 +156,7 @@ class TestAptSourceConfig(TestCase):
         self.apt_src_basic_tri([cfg1, cfg2, cfg3])
 
     def test_apt_src_basic_dict_tri(self):
-        """ test_apt_src_basic_dict_tri
+        """test_apt_src_basic_dict_tri
         Test Fix three deb source string, has to overwrite mirror conf in
         params. Test with filenames provided in config.
         Provided in a dictionary with filename being the key (new format)
@@ -176,7 +176,7 @@ class TestAptSourceConfig(TestCase):
         self.apt_src_basic_tri(cfg)
 
     def test_apt_src_basic_nofn(self):
-        """ test_apt_src_basic_nofn
+        """test_apt_src_basic_nofn
         Test Fix deb source string, has to overwrite mirror conf in params.
         Test without a filename provided in config and test for known fallback.
         """
@@ -187,7 +187,7 @@ class TestAptSourceConfig(TestCase):
             self.apt_src_basic(self.fallbackfn, [cfg])
 
     def apt_src_replacement(self, filename, cfg):
-        """ apt_src_replace
+        """apt_src_replace
         Test Autoreplacement of MIRROR and RELEASE in source specs
         """
         params = self._get_default_params()
@@ -202,7 +202,7 @@ class TestAptSourceConfig(TestCase):
                                   contents, flags=re.IGNORECASE))
 
     def test_apt_src_replace(self):
-        """ test_apt_src_replace
+        """test_apt_src_replace
         Test Autoreplacement of MIRROR and RELEASE in source specs with
         Filename being set
         """
@@ -211,7 +211,7 @@ class TestAptSourceConfig(TestCase):
         self.apt_src_replacement(self.aptlistfile, [cfg])
 
     def apt_src_replace_tri(self, cfg):
-        """ apt_src_replace_tri
+        """apt_src_replace_tri
         Test three autoreplacements of MIRROR and RELEASE in source specs with
         generic part
         """
@@ -231,7 +231,7 @@ class TestAptSourceConfig(TestCase):
                                   contents, flags=re.IGNORECASE))
 
     def test_apt_src_replace_tri(self):
-        """ test_apt_src_replace_tri
+        """test_apt_src_replace_tri
         Test three autoreplacements of MIRROR and RELEASE in source specs with
         Filename being set
         """
@@ -244,7 +244,7 @@ class TestAptSourceConfig(TestCase):
         self.apt_src_replace_tri([cfg1, cfg2, cfg3])
 
     def test_apt_src_replace_dict_tri(self):
-        """ test_apt_src_replace_dict_tri
+        """test_apt_src_replace_dict_tri
         Test three autoreplacements of MIRROR and RELEASE in source specs with
         Filename being set
         Provided in a dictionary with filename being the key (new format)
@@ -252,13 +252,13 @@ class TestAptSourceConfig(TestCase):
         filenames to be overwritten inside the directory entry.
         """
         cfg = {self.aptlistfile: {'source': 'deb $MIRROR $RELEASE multiverse'},
-               'notused':        {'source': 'deb $MIRROR $RELEASE main',
-                                  'filename': self.aptlistfile2},
+               'notused': {'source': 'deb $MIRROR $RELEASE main',
+                           'filename': self.aptlistfile2},
                self.aptlistfile3: {'source': 'deb $MIRROR $RELEASE universe'}}
         self.apt_src_replace_tri(cfg)
 
     def test_apt_src_replace_nofn(self):
-        """ test_apt_src_replace_nofn
+        """test_apt_src_replace_nofn
         Test Autoreplacement of MIRROR and RELEASE in source specs with
         No filename being set
         """
@@ -267,7 +267,7 @@ class TestAptSourceConfig(TestCase):
             self.apt_src_replacement(self.fallbackfn, [cfg])
 
     def apt_src_keyid(self, filename, cfg, keynum):
-        """ apt_src_keyid
+        """apt_src_keyid
         Test specification of a source + keyid
         """
         params = self._get_default_params()
@@ -293,7 +293,7 @@ class TestAptSourceConfig(TestCase):
                                   contents, flags=re.IGNORECASE))
 
     def test_apt_src_keyid(self):
-        """ test_apt_src_keyid
+        """test_apt_src_keyid
         Test specification of a source + keyid with filename being set
         """
         cfg = {'source': ('deb '
@@ -305,7 +305,7 @@ class TestAptSourceConfig(TestCase):
         self.apt_src_keyid(self.aptlistfile, [cfg], 1)
 
     def test_apt_src_keyid_tri(self):
-        """ test_apt_src_keyid_tri
+        """test_apt_src_keyid_tri
         Test specification of a source + keyid with filename being set
         Setting three of such, check for content and keys
         """
@@ -345,7 +345,7 @@ class TestAptSourceConfig(TestCase):
                                   contents, flags=re.IGNORECASE))
 
     def test_apt_src_keyid_nofn(self):
-        """ test_apt_src_keyid_nofn
+        """test_apt_src_keyid_nofn
         Test specification of a source + keyid without filename being set
         """
         cfg = {'source': ('deb '
@@ -357,7 +357,7 @@ class TestAptSourceConfig(TestCase):
             self.apt_src_keyid(self.fallbackfn, [cfg], 1)
 
     def apt_src_key(self, filename, cfg):
-        """ apt_src_key
+        """apt_src_key
         Test specification of a source + key
         """
         params = self._get_default_params()
@@ -378,7 +378,7 @@ class TestAptSourceConfig(TestCase):
                                   contents, flags=re.IGNORECASE))
 
     def test_apt_src_key(self):
-        """ test_apt_src_key
+        """test_apt_src_key
         Test specification of a source + key with filename being set
         """
         cfg = {'source': ('deb '
@@ -390,7 +390,7 @@ class TestAptSourceConfig(TestCase):
         self.apt_src_key(self.aptlistfile, cfg)
 
     def test_apt_src_key_nofn(self):
-        """ test_apt_src_key_nofn
+        """test_apt_src_key_nofn
         Test specification of a source + key without filename being set
         """
         cfg = {'source': ('deb '
@@ -402,7 +402,7 @@ class TestAptSourceConfig(TestCase):
             self.apt_src_key(self.fallbackfn, cfg)
 
     def test_apt_src_keyonly(self):
-        """ test_apt_src_keyonly
+        """test_apt_src_keyonly
         Test specification key without source
         """
         params = self._get_default_params()
@@ -419,7 +419,7 @@ class TestAptSourceConfig(TestCase):
         self.assertFalse(os.path.isfile(self.aptlistfile))
 
     def test_apt_src_keyidonly(self):
-        """ test_apt_src_keyidonly
+        """test_apt_src_keyidonly
         Test specification of a keyid without source
         """
         params = self._get_default_params()
@@ -436,7 +436,7 @@ class TestAptSourceConfig(TestCase):
         self.assertFalse(os.path.isfile(self.aptlistfile))
 
     def test_apt_src_keyid_real(self):
-        """ test_apt_src_keyid_real
+        """test_apt_src_keyid_real
         Test specification of a keyid without source incl
         up to addition of the key (nothing but add_key_raw mocked)
         """
@@ -454,7 +454,7 @@ class TestAptSourceConfig(TestCase):
         self.assertFalse(os.path.isfile(self.aptlistfile))
 
     def test_apt_src_longkeyid_real(self):
-        """ test_apt_src_longkeyid_real
+        """test_apt_src_longkeyid_real
         Test specification of a long key fingerprint without source incl
         up to addition of the key (nothing but add_key_raw mocked)
         """
@@ -472,7 +472,7 @@ class TestAptSourceConfig(TestCase):
         self.assertFalse(os.path.isfile(self.aptlistfile))
 
     def test_apt_src_ppa(self):
-        """ test_apt_src_ppa
+        """test_apt_src_ppa
         Test specification of a ppa
         """
         params = self._get_default_params()
@@ -491,7 +491,7 @@ class TestAptSourceConfig(TestCase):
         self.assertFalse(os.path.isfile(self.aptlistfile))
 
     def test_apt_src_ppa_tri(self):
-        """ test_apt_src_ppa_tri
+        """test_apt_src_ppa_tri
         Test specification of a ppa
         """
         params = self._get_default_params()
@@ -519,7 +519,7 @@ class TestAptSourceConfig(TestCase):
         self.assertFalse(os.path.isfile(self.aptlistfile3))
 
     def test_convert_to_new_format(self):
-        """ test_convert_to_new_format
+        """test_convert_to_new_format
         Test the conversion of old to new format
         And the noop conversion of new to new format as well
         """
-- 
cgit v1.2.3