Merge system-3.4 and 3.6

6 files changed, 9 insertions, 17 deletions

diff --git a/devbot/config.py b/devbot/config.py
index 259c4f2..513fe10 100644
--- a/devbot/config.py
+++ b/devbot/config.py
@@ -233,8 +233,6 @@ def _filter_if(item):
     return eval(item["if"], globals)
 
 def load_checks():
-    version = distro.get_distro_info().system_version
-
     checks = []
     for file in dep_files:
         path = os.path.join(config_dir, "deps", "%s.json" % file)
@@ -243,11 +241,7 @@ def load_checks():
     return filter(_filter_if, checks)
 
 def load_modules():
-    version = distro.get_distro_info().system_version
-
-    module_files = ["system-%s.json" % version,
-                    "sugar.json",
-                    "activities.json"]
+    global module_files
 
     modules = []
 
diff --git a/devbot/plugins/debian.py b/devbot/plugins/debian.py
index 38d5be4..09f8abc 100644
--- a/devbot/plugins/debian.py
+++ b/devbot/plugins/debian.py
@@ -89,7 +89,7 @@ class DistroInfo(interfaces.DistroInfo):
  
         self.name = "debian"
         self.version = "unknown"
-        self.system_version = "3.4"
+        self.gnome_version = "3.4"
         self.gstreamer_version = "0.10"
         self.valid = True
         self.supported = (arch in ["i686", "x86_64"])
diff --git a/devbot/plugins/fedora.py b/devbot/plugins/fedora.py
index 3cfdfef..60d73d8 100644
--- a/devbot/plugins/fedora.py
+++ b/devbot/plugins/fedora.py
@@ -87,7 +87,7 @@ class DistroInfo(interfaces.DistroInfo):
 
         self.name = "fedora"
         self.version = "unknown"
-        self.system_version = "3.6"
+        self.gnome_version = "3.6"
         self.gstreamer_version = "1.0"
         self.use_lib64 = (arch == "x86_64")
         self.valid = True
@@ -101,7 +101,7 @@ class DistroInfo(interfaces.DistroInfo):
  
         if release == "Fedora release 17 (Beefy Miracle)":
             self.version = "17"
-            self.system_version = "3.4"
+            self.gnome_version = "3.4"
             self.gstreamer_version = "0.10"
         elif release == "Fedora release 18 (Spherical Cow)":
             self.version = "18"
diff --git a/devbot/plugins/interfaces.py b/devbot/plugins/interfaces.py
index c6db014..d8659bf 100644
--- a/devbot/plugins/interfaces.py
+++ b/devbot/plugins/interfaces.py
@@ -43,10 +43,8 @@ class DistroInfo:
         self.version = None
         """The distribution version."""
     
-        self.system_version = None
-        """A distribution independent system version, normally the same
-           major version of GNOME installed on the system.
-        """
+        self.gnome_version = None
+        """The major version of GNOME shipped with the distribution."""
 
         self.gstreamer_version = None
         """The version of gstreamer shipped with the distribution."""
diff --git a/devbot/plugins/ubuntu.py b/devbot/plugins/ubuntu.py
index 556aaab..eaeb482 100644
--- a/devbot/plugins/ubuntu.py
+++ b/devbot/plugins/ubuntu.py
@@ -12,7 +12,7 @@ class DistroInfo(interfaces.DistroInfo):
  
         self.name = "ubuntu"
         self.version = "unknown"
-        self.system_version = "3.4"
+        self.gnome_version = "3.4"
         self.gstreamer_version = "1.0"
         self.valid = True
         self.supported = (arch in ["i386", "i686", "x86_64"])
@@ -27,7 +27,7 @@ class DistroInfo(interfaces.DistroInfo):
             self.supported = False
 
         if self.version and self.version >= "12.10":
-            self.system_version = "3.6"
+            self.gnome_version = "3.6"
 
     def _get_distributor(self):
         try:
diff --git a/devbot/plugins/unknown.py b/devbot/plugins/unknown.py
index f843fd5..8589ef6 100644
--- a/devbot/plugins/unknown.py
+++ b/devbot/plugins/unknown.py
@@ -31,7 +31,7 @@ class DistroInfo(interfaces.DistroInfo):
         self.use_lib64 = os.path.exists("/usr/lib64")
         self.name = "unknown"
         self.version = "unknown"
-        self.system_version = "3.4"
+        self.gnome_version = "3.4"
         self.gstreamer_version = "0.10"
         self.valid = True
         self.supported = False