drop errorlist from convert_to_new_format

2 files changed, 5 insertions, 13 deletions

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)