From ec56e7ec7d9ed7e85b6f97de133e518b7714e657 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Mon, 14 Jan 2013 09:06:26 +0000
Subject: Merge branch 'testing'

---
diff --git a/config/modules/system.json b/config/modules/system.json
index eddd82c..db6f1ed 100644
--- a/config/modules/system.json
+++ b/config/modules/system.json
@@ -15,6 +15,7 @@
         "repo": "git://github.com/dnarvaez/gnome-keyring.git"
     }, 
     {
+        "if": "gnome_version == '3.4' or distro == 'ubuntu-12.10'", 
         "name": "glib", 
         "options": [
             "--disable-modular-tests"
@@ -23,6 +24,7 @@
         "tag": "2.34.3"
     }, 
     {
+        "if": "gnome_version == '3.4' or distro == 'ubuntu-12.10'", 
         "name": "gobject-introspection", 
         "options": [
             "--disable-tests"
@@ -31,6 +33,7 @@
         "tag": "GOBJECT_INTROSPECTION_1_34_2"
     }, 
     {
+        "if": "gnome_version == '3.4' or distro == 'ubuntu-12.10'", 
         "name": "pygobject", 
         "repo": "git://git.gnome.org/pygobject", 
         "tag": "c36e12368bb430ca1fb6eafd7d86f59c44965a31"
@@ -96,6 +99,7 @@
         "tag": "libxklavier-5.3"
     }, 
     {
+        "if": "gnome_version == '3.4' or distro == 'ubuntu-12.10'", 
         "name": "metacity", 
         "options": [
             "--disable-themes-documentation"
diff --git a/config/packages/basesystem.json b/config/packages/basesystem.json
index 7b5c082..9b062cb 100644
--- a/config/packages/basesystem.json
+++ b/config/packages/basesystem.json
@@ -4,6 +4,7 @@
             "openssh-server", 
             "apt", 
             "ibritish", 
+            "iamerican", 
             "bsdutils", 
             "make", 
             "apt-utils", 
diff --git a/devbot/config.py b/devbot/config.py
index fe96f17..73cad0c 100644
--- a/devbot/config.py
+++ b/devbot/config.py
@@ -182,7 +182,8 @@ def _filter_if(item):
 
     distro_info = distro.get_distro_info()
     globals = {"gstreamer_version": distro_info.gstreamer_version,
-               "gnome_version": distro_info.gnome_version}
+               "gnome_version": distro_info.gnome_version,
+               "distro": "%s-%s" % (distro_info.name, distro_info.version)}
 
     return eval(item["if"], globals)
 
diff --git a/tests/devbot/test_config.py b/tests/devbot/test_config.py
index 32c2526..f4d3260 100644
--- a/tests/devbot/test_config.py
+++ b/tests/devbot/test_config.py
@@ -86,7 +86,7 @@ class TestConfig(common.DevbotTestCase):
         self.assertEquals("fedora", distro.get_distro_info().name)
         self.assertEquals("18", distro.get_distro_info().version)
         modules = config.load_modules()
-        self._assert_module(modules, "glib")
+        self._assert_no_module(modules, "glib")
         self._assert_no_module(modules, "gtk+")
         self._assert_no_module(modules, "gnome-keyring")
         self._assert_no_module(modules, "gstreamer")
--
cgit v0.9.1