[releng/abderrahim/refactor: 4/7] convert-to-tarballs: drop support for renames

[Abderrahim Kitouni <akitouni src gnome org>]

commit 7870f78f47b50f8cb82a9541ff694859a7d59370
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Apr 3 19:31:46 2020 +0100

    convert-to-tarballs: drop support for renames
    
    no need to have three names per module, having two names is already a lot

 tools/smoketesting/convert-to-tarballs.py         | 26 +++--------------------
 tools/smoketesting/tarball-conversion-3-34.config |  5 -----
 tools/smoketesting/tarball-conversion-3-36.config |  6 ------
 tools/smoketesting/tarball-conversion.config      |  6 ------
 4 files changed, 3 insertions(+), 40 deletions(-)
---
diff --git a/tools/smoketesting/convert-to-tarballs.py b/tools/smoketesting/convert-to-tarballs.py
index 4c23106..f901a32 100755
--- a/tools/smoketesting/convert-to-tarballs.py
+++ b/tools/smoketesting/convert-to-tarballs.py
@@ -106,7 +106,6 @@ class Options:
     def __init__(self, filename):
         self.filename = filename
         self.mirrors = {}
-        self.rename = {}
         self.release_sets = []
         self.release_set = []
         self.subdir = {}
@@ -116,9 +115,6 @@ class Options:
         self.module_locations = []
         self._read_conversion_info()
 
-    def translate_name(self, modulename):
-        return self.rename.get(modulename, modulename)
-
     def get_download_site(self, cvssite, modulename):
         for list in self.module_locations:
             if list[0] == modulename:
@@ -171,18 +167,6 @@ class Options:
                 sys.stderr.write('Bad mirror node\n')
                 sys.exit(1)
 
-    def _get_renames(self, renames_node):
-        for node in renames_node.childNodes:
-            if node.nodeType != Node.ELEMENT_NODE:
-                continue
-            if node.nodeName == 'name':
-                old = node.attributes.get('old').nodeValue
-                new = node.attributes.get('new').nodeValue
-                self.rename[old] = new
-            else:
-                sys.stderr.write('Bad rename node\n')
-                sys.exit(1)
-
     def _get_modulelist(self, modulelist_node):
         for node in modulelist_node.childNodes:
             if node.nodeType != Node.ELEMENT_NODE:
@@ -243,8 +227,6 @@ class Options:
                 self._get_locations(node)
             elif node.nodeName == 'mirrors':
                 self._get_mirrors(node)
-            elif node.nodeName == 'rename':
-                self._get_renames(node)
             elif node.nodeName == 'whitelist':
                 self._get_modulelist(node)
             else:
@@ -458,16 +440,14 @@ class ConvertToTarballs:
             self.aliases = projectconf['aliases']
 
     def find_tarball_by_name(self, name):
-        translated_name = self.options.translate_name(name)
-
-        real_name = self.options.get_real_name(translated_name)
-        max_version = self.options.get_version_limit(translated_name)
+        real_name = self.options.get_real_name(name)
+        max_version = self.options.get_version_limit(name)
         baselocation = self.options.get_download_site('gnome.org', real_name)
 
         # Ask the locator to hunt down a tarball
         location, version = self.locator.find_tarball(baselocation, real_name, max_version)
         # Save the versions
-        self.all_tarballs.append(translated_name)
+        self.all_tarballs.append(name)
         self.all_versions.append(version)
 
         return location, version
diff --git a/tools/smoketesting/tarball-conversion-3-34.config 
b/tools/smoketesting/tarball-conversion-3-34.config
index 9e530b0..f2847e4 100644
--- a/tools/smoketesting/tarball-conversion-3-34.config
+++ b/tools/smoketesting/tarball-conversion-3-34.config
@@ -33,11 +33,6 @@
   <mirrors>
     <mirror location="https://download.gnome.org/"; alternate="sftp://master.gnome.org/ftp/pub/GNOME/"; />
   </mirrors>
-  <!-- Should we remove this functionality? Probably makes more sense to rename modules in BuildStream 
instead. -->
-  <rename>
-    <name old="gmime3"               new="gmime"/>
-    <name old="pyatspi2"             new="pyatspi"/>
-  </rename>
   <whitelist>
     ## EXTERNAL
     <package name="ModemManager" limit="1.11"/>
diff --git a/tools/smoketesting/tarball-conversion-3-36.config 
b/tools/smoketesting/tarball-conversion-3-36.config
index dbb6593..2162883 100644
--- a/tools/smoketesting/tarball-conversion-3-36.config
+++ b/tools/smoketesting/tarball-conversion-3-36.config
@@ -34,12 +34,6 @@
   <mirrors>
     <mirror location="https://download.gnome.org/"; alternate="sftp://master.gnome.org/ftp/pub/GNOME/"; />
   </mirrors>
-  <!-- Should we remove this functionality? Probably makes more sense to rename modules in BuildStream 
instead. -->
-  <rename>
-    <name old="gmime3"               new="gmime"/>
-    <name old="ostree"               new="libostree"/>
-    <name old="pyatspi2"             new="pyatspi"/>
-  </rename>
   <whitelist>
     ## EXTERNAL
     <package name="ModemManager" limit="1.13"/>
diff --git a/tools/smoketesting/tarball-conversion.config b/tools/smoketesting/tarball-conversion.config
index d8b2b10..a695663 100644
--- a/tools/smoketesting/tarball-conversion.config
+++ b/tools/smoketesting/tarball-conversion.config
@@ -34,12 +34,6 @@
   <mirrors>
     <mirror location="https://download.gnome.org/"; alternate="sftp://master.gnome.org/ftp/pub/GNOME/"; />
   </mirrors>
-  <!-- Should we remove this functionality? Probably makes more sense to rename modules in BuildStream 
instead. -->
-  <rename>
-    <name old="gmime3"               new="gmime"/>
-    <name old="ostree"               new="libostree"/>
-    <name old="pyatspi2"             new="pyatspi"/>
-  </rename>
   <whitelist>
     ## EXTERNAL
     <package name="ModemManager"/>