From: Zack Cerza <zack@redhat.com>
Date: Fri, 20 May 2016 23:06:07 +0000 (-0600)
Subject: packaging: Drop GitbuilderProject._get_codename()
X-Git-Tag: 1.1.0~603^2~12
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=dc2894944aaef8aca5f00ebc929c7f6a0f79a193;p=teuthology.git

packaging: Drop GitbuilderProject._get_codename()

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/packaging.py b/teuthology/packaging.py
index 2ff4ecd972..1325ce5053 100644
--- a/teuthology/packaging.py
+++ b/teuthology/packaging.py
@@ -585,7 +585,7 @@ class GitbuilderProject(object):
             # deb based systems use codename instead of a distro/version combo
             if not codename:
                 # lookup codename based on distro string
-                codename = cls._get_codename(distro, version)
+                codename = OS._version_to_codename(distro, version)
                 if not codename:
                     msg = "No codename found for: {distro} {version}".format(
                         distro=distro,
@@ -600,23 +600,6 @@ class GitbuilderProject(object):
             version=cls._parse_version(version),
         )
 
-    @staticmethod
-    def _get_codename(distro, version):
-        """
-        Attempts to find the codename for a given distro / version
-        pair.  Will first attempt to find the codename for the full
-        version and if not found will look again using only the major
-        version.  If a codename is not found, None is returned.
-
-        The constant DISTRO_CODENAME_MAP is used to provide this mapping.
-
-        :returns: The codename as string or None if not found.
-        """
-        try:
-            return OS._version_to_codename(distro, version)
-        except RuntimeError:
-            pass
-
     def _get_version(self):
         """
         Attempts to find the distro version from the job_config.