Bug 1385503 - Correct rust srcdir url again. r=gps
authorRalph Giles <giles@mozilla.com>
Fri, 28 Jul 2017 17:04:39 -0700
changeset 420489 114785959b0c805b921d3cbe1384caa850914339
parent 420488 78b337ef1476d54e06be6691b64a4583bf05346d
child 420490 9e2a5ef546dd9da5325f62de1ffb6336faffde9c
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1385503
milestone56.0a1
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
Bug 1385503 - Correct rust srcdir url again. r=gps The 'src' subdir needs to be part of the path *after* the blob/commit_id section of the url, so we need to no strip it from the prefix when we match. MozReview-Commit-ID: 9HA3a7d8kh4
toolkit/crashreporter/tools/symbolstore.py
--- a/toolkit/crashreporter/tools/symbolstore.py
+++ b/toolkit/crashreporter/tools/symbolstore.py
@@ -393,26 +393,26 @@ class Dumper:
         self.srcsrv = srcsrv
         if repo_manifest:
             self.parse_repo_manifest(repo_manifest)
         self.file_mapping = file_mapping or {}
         # Add a static mapping for Rust sources.
         target_os = buildconfig.substs['OS_ARCH']
         rust_srcdir = None
         if target_os == 'WINNT':
-            rust_srcdir = 'C:/projects/rust/src/'
+            rust_srcdir = 'C:/projects/rust/'
         elif target_os == 'Darwin':
-            rust_srcdir = '/Users/travis/build/rust-lang/rust/src/'
+            rust_srcdir = '/Users/travis/build/rust-lang/rust/'
         elif target_os == 'Linux':
-            rust_srcdir = '/checkout/src/'
+            rust_srcdir = '/checkout/'
         if rust_srcdir is not None:
             self.srcdirs.append(rust_srcdir)
             Dumper.srcdirRepoInfo[rust_srcdir] = GitRepoInfo(rust_srcdir,
                                                              buildconfig.substs['RUSTC_COMMIT'],
-                                                             'https://github.com/rust-lang/rust/src/')
+                                                             'https://github.com/rust-lang/rust/')
 
     def parse_repo_manifest(self, repo_manifest):
         """
         Parse an XML manifest of repository info as produced
         by the `repo manifest -r` command.
         """
         doc = parse(repo_manifest)
         if doc.firstChild.tagName != "manifest":