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
--- 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":