bug 615097: config.py shouldn't depend on non Python libraries. r=catlee/rail
authorSyed Albiz
Mon, 06 Dec 2010 12:32:23 -0500
changeset 3354 fc3a0690fad532a88790c39d730e252f540d98d0
parent 3353 8bd8590c843e6c84b5572a96e8d3e14618d4690c
child 3355 e5262b6572a35d945c7be62ea9ab092c3cb34a84
child 3356 c83e37f72f41508614c489460910db01880c5ba7
child 3363 531efa39e54d93fade2dc14b679b8632c4acf14f
push id2645
push userbhearsum@mozilla.com
push dateMon, 06 Dec 2010 17:55:07 +0000
reviewerscatlee, rail
bugs615097
bug 615097: config.py shouldn't depend on non Python libraries. r=catlee/rail
mozilla/config.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -1,16 +1,10 @@
 from copy import deepcopy
 
-try:
-    from buildbot.process.properties import WithProperties
-except ImportError:
-    def WithProperties(fmtstring, *args):
-        return fmtstring
-
 import localconfig
 reload(localconfig)
 from localconfig import MAC_SNOW_MINIS, MAC_MINIS, XSERVES, LINUX_VMS, \
                         LINUX_IXS, WIN32_VMS, WIN32_IXS, SLAVES, \
                         TRY_SLAVES
 
 GLOBAL_VARS = {
     # It's a little unfortunate to have both of these but some things (HgPoller)
@@ -335,17 +329,16 @@ PLATFORM_VARS = {
                 'MOZ_OBJDIR': OBJDIR,
                 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
                 'SYMBOL_SERVER_USER': 'ffxbld',
                 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
                 'SYMBOL_SERVER_SSH_KEY': "/home/cltbld/.ssh/ffxbld_dsa",
                 'TINDERBOX_OUTPUT': '1',
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'CCACHE_DIR': '/builds/ccache',
-                'CCACHE_BASEDIR': WithProperties('%(basedir:-)s'),
                 'CCACHE_COMPRESS': '1',
                 'CCACHE_UMASK': '002',
                 'LC_ALL': 'C',
             },
             'enable_opt_unittests': False,
             'enable_checktests': True,
             'talos_masters': GLOBAL_VARS['talos_masters'],
         },
@@ -370,17 +363,16 @@ PLATFORM_VARS = {
                 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
                 'SYMBOL_SERVER_SSH_KEY': "/home/cltbld/.ssh/ffxbld_dsa",
                 'MOZ_SYMBOLS_EXTRA_BUILDID': 'linux64',
                 'TINDERBOX_OUTPUT': '1',
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'CCACHE_DIR': '/builds/ccache',
                 'CCACHE_COMPRESS': '1',
                 'CCACHE_UMASK': '002',
-                'CCACHE_BASEDIR': WithProperties('%(basedir:-)s'),
                 'LC_ALL': 'C',
             },
             'enable_opt_unittests': False,
             'enable_checktests': True,
             'talos_masters': GLOBAL_VARS['talos_masters'],
         },
         'macosx': {
             'base_name': 'OS X 10.5.2 %(branch)s',
@@ -484,17 +476,16 @@ PLATFORM_VARS = {
             'env': {
                 'MOZ_OBJDIR': OBJDIR,
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'DISPLAY': ':2',
                 'LD_LIBRARY_PATH': '%s/dist/bin' % OBJDIR,
                 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'CCACHE_DIR': '/builds/ccache',
-                'CCACHE_BASEDIR': WithProperties('%(basedir:-)s'),
                 'CCACHE_COMPRESS': '1',
                 'CCACHE_UMASK': '002',
                 'LC_ALL': 'C',
             },
             'enable_unittests': False,
             'enable_checktests': True,
             'talos_masters': GLOBAL_VARS['talos_masters'],
         },
@@ -512,17 +503,16 @@ PLATFORM_VARS = {
             'env': {
                 'MOZ_OBJDIR': OBJDIR,
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'DISPLAY': ':2',
                 'LD_LIBRARY_PATH': '%s/dist/bin' % OBJDIR,
                 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'CCACHE_DIR': '/builds/ccache',
-                'CCACHE_BASEDIR': WithProperties('%(basedir:-)s'),
                 'CCACHE_COMPRESS': '1',
                 'CCACHE_UMASK': '002',
                 'LC_ALL': 'C',
             },
             'enable_unittests': False,
             'enable_checktests': True,
             'talos_masters': GLOBAL_VARS['talos_masters'],
         },