Backed out changeset 229cd3b8bf5d (bug 1279048) for build bustage CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Fri, 08 Jul 2016 12:02:33 -0700
changeset 304238 53b24e115c194df3cc9cbd9a99959209637a4beb
parent 304237 229cd3b8bf5dcca4c514fe7315fdf0ac6fa31541
child 304239 751186781016d52db0b7a957af1ffe0358574012
push id30419
push userphilringnalda@gmail.com
push dateSat, 09 Jul 2016 15:51:15 +0000
treeherdermozilla-central@e3dcf062007e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1279048
milestone50.0a1
backs out229cd3b8bf5dcca4c514fe7315fdf0ac6fa31541
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 229cd3b8bf5d (bug 1279048) for build bustage CLOSED TREE
toolkit/crashreporter/tools/symbolstore.py
--- a/toolkit/crashreporter/tools/symbolstore.py
+++ b/toolkit/crashreporter/tools/symbolstore.py
@@ -131,25 +131,21 @@ rootRegex = re.compile(r'^\S+?:/+(?:[^\s
 
 def read_output(*args):
     (stdout, _) = subprocess.Popen(args=args, stdout=subprocess.PIPE).communicate()
     return stdout.rstrip()
 
 class HGRepoInfo:
     def __init__(self, path):
         self.path = path
-
-        rev = os.environ.get('MOZ_SOURCE_CHANGESET')
-        if not rev:
-            rev = read_output('hg', '-R', path,
-                              'parent', '--template={node|short}')
-
-        # Look for the default hg path. If MOZ_SOURCE_REPO is set, we
+        rev = read_output('hg', '-R', path,
+                          'parent', '--template={node|short}')
+        # Look for the default hg path.  If SRVSRV_ROOT is set, we
         # don't bother asking hg.
-        hg_root = os.environ.get('MOZ_SOURCE_REPO')
+        hg_root = os.environ.get("SRCSRV_ROOT")
         if hg_root:
             root = hg_root
         else:
             root = read_output('hg', '-R', path,
                                'showconfig', 'paths.default')
             if not root:
                 print >> sys.stderr, "Failed to get HG Repo for %s" % path
         cleanroot = None
@@ -157,17 +153,17 @@ class HGRepoInfo:
             match = rootRegex.match(root)
             if match:
                 cleanroot = match.group(1)
                 if cleanroot.endswith('/'):
                     cleanroot = cleanroot[:-1]
         if cleanroot is None:
             print >> sys.stderr, textwrap.dedent("""\
                 Could not determine repo info for %s.  This is either not a clone of the web-based
-                repository, or you have not specified MOZ_SOURCE_REPO, or the clone is corrupt.""") % path
+                repository, or you have not specified SRCSRV_ROOT, or the clone is corrupt.""") % path
             sys.exit(1)
         self.rev = rev
         self.root = root
         self.cleanroot = cleanroot
 
     def GetFileInfo(self, file):
         return HGFileInfo(file, self)
 
@@ -204,17 +200,17 @@ class GitRepoInfo:
             match = rootRegex.match(root)
             if match:
                 cleanroot = match.group(1)
                 if cleanroot.endswith('/'):
                     cleanroot = cleanroot[:-1]
         if cleanroot is None:
             print >> sys.stderr, textwrap.dedent("""\
                 Could not determine repo info for %s (%s).  This is either not a clone of a web-based
-                repository, or you have not specified MOZ_SOURCE_REPO, or the clone is corrupt.""") % (path, root)
+                repository, or you have not specified SRCSRV_ROOT, or the clone is corrupt.""") % (path, root)
             sys.exit(1)
         self.rev = rev
         self.cleanroot = cleanroot
 
     def GetFileInfo(self, file):
         return GitFileInfo(file, self)
 
 class GitFileInfo(VCSFileInfo):
@@ -613,17 +609,17 @@ class Dumper:
         in the proper directory structure in  |symbol_path|; processing is performed
         asynchronously, and Finish must be called to wait for it complete and cleanup.
         All files after the first are fallbacks in case the first file does not process
         successfully; if it does, no other files will be touched."""
         self.output_pid(sys.stderr, "Submitting jobs for files: %s" % str(files))
 
         # tries to get the vcs root from the .mozconfig first - if it's not set
         # the tinderbox vcs path will be assigned further down
-        vcs_root = os.environ.get('MOZ_SOURCE_REPO')
+        vcs_root = os.environ.get("SRCSRV_ROOT")
         for arch_num, arch in enumerate(self.archs):
             self.files_record[files] = 0 # record that we submitted jobs for this tuple of files
             self.SubmitJob(files[-1], 'ProcessFilesWork', args=(files, arch_num, arch, vcs_root, after, after_arg), callback=self.ProcessFilesFinished)
 
     def dump_syms_cmdline(self, file, arch, files):
         '''
         Get the commandline used to invoke dump_syms.
         '''