[releng/abderrahim/refactor: 7/7] stop pretending we use CVS [!] to decide where to get things from

[Abderrahim Kitouni <akitouni src gnome org>]

commit 36e3bb50eb2388546ee6a4e400f960d5891b3ed0
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sun Apr 5 09:40:15 2020 +0100

    stop pretending we use CVS [!] to decide where to get things from

 tools/smoketesting/convert-to-tarballs.py         | 18 +++++++++---------
 tools/smoketesting/tarball-conversion-3-34.config |  2 +-
 tools/smoketesting/tarball-conversion-3-36.config |  2 +-
 tools/smoketesting/tarball-conversion.config      |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/tools/smoketesting/convert-to-tarballs.py b/tools/smoketesting/convert-to-tarballs.py
index 43f7155..e840508 100755
--- a/tools/smoketesting/convert-to-tarballs.py
+++ b/tools/smoketesting/convert-to-tarballs.py
@@ -110,18 +110,18 @@ class Options:
         self.release_set = []
         self.version_limit = {}
         self.real_name = {}
-        self.cvs_locations = []
+        self.default_site = None
         self.module_locations = []
         self._read_conversion_info()
 
-    def get_download_site(self, cvssite, modulename):
+    def get_download_site(self, modulename):
         for module, location in self.module_locations:
             if module == modulename:
                 return location.format(module=modulename)
 
-        for cvs, location in self.cvs_locations:
-            if cvs == cvssite:
-                return location.format(module=modulename)
+        if self.default_site:
+            return self.default_site.format(module=modulename)
+
         raise IOError('No download site found!\n')
 
     def _get_locations(self, locations_node):
@@ -130,9 +130,9 @@ class Options:
                 continue
             if node.nodeName == 'site':
                 location = node.attributes.get('location').nodeValue
-                if node.attributes.get('cvs') is not None:
-                    cvs = node.attributes.get('cvs').nodeValue
-                    self.cvs_locations.append([cvs, location])
+                if node.attributes.get('default') is not None:
+                    assert self.default_site is None, "only one default site can be specified"
+                    self.default_site = location
                 elif node.attributes.get('module') is not None:
                     module = node.attributes.get('module').nodeValue
                     self.module_locations.append([module, location])
@@ -422,7 +422,7 @@ class ConvertToTarballs:
     def find_tarball_by_name(self, 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)
+        baselocation = self.options.get_download_site(real_name)
 
         # Ask the locator to hunt down a tarball
         location, version = self.locator.find_tarball(baselocation, real_name, max_version)
diff --git a/tools/smoketesting/tarball-conversion-3-34.config 
b/tools/smoketesting/tarball-conversion-3-34.config
index 67f2bbb..34e5b06 100644
--- a/tools/smoketesting/tarball-conversion-3-34.config
+++ b/tools/smoketesting/tarball-conversion-3-34.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <conversioninfo>
   <locations>  FIXME: get a better name
-    <site cvs="gnome.org" location="https://download.gnome.org/sources/{module}/"; />
+    <site default="true" location="https://download.gnome.org/sources/{module}/"; />
 
     <site module="ModemManager"              location="https://www.freedesktop.org/software/ModemManager/"/>
     <site module="PackageKit"                
location="https://www.freedesktop.org/software/PackageKit/releases/"/>
diff --git a/tools/smoketesting/tarball-conversion-3-36.config 
b/tools/smoketesting/tarball-conversion-3-36.config
index 2faaacc..f66c13a 100644
--- a/tools/smoketesting/tarball-conversion-3-36.config
+++ b/tools/smoketesting/tarball-conversion-3-36.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <conversioninfo>
   <locations>  FIXME: get a better name
-    <site cvs="gnome.org" location="https://download.gnome.org/sources/{module}/"; />
+    <site default="true" location="https://download.gnome.org/sources/{module}/"; />
 
     <site module="ModemManager"              location="https://www.freedesktop.org/software/ModemManager/"/>
     <site module="accountsservice"           
location="https://www.freedesktop.org/software/accountsservice/"/>
diff --git a/tools/smoketesting/tarball-conversion.config b/tools/smoketesting/tarball-conversion.config
index a3af929..0202139 100644
--- a/tools/smoketesting/tarball-conversion.config
+++ b/tools/smoketesting/tarball-conversion.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <conversioninfo>
   <locations>  FIXME: get a better name
-    <site cvs="gnome.org" location="https://download.gnome.org/sources/{module}/"; />
+    <site default="true" location="https://download.gnome.org/sources/{module}/"; />
 
     <site module="ModemManager"              location="https://www.freedesktop.org/software/ModemManager/"/>
     <site module="accountsservice"           
location="https://www.freedesktop.org/software/accountsservice/"/>