Bug 1371372 - Remove cargo tarball naming work-around. r?mshal draft
authorRalph Giles <giles@mozilla.com>
Thu, 08 Jun 2017 11:48:55 -0700
changeset 591202 240168722100ba8f66fdb622ccc9a803c9052cd1
parent 591163 0fcf84f7589030300cdfce8f80cafb2f7b2655a8
child 591203 a7c288716ce5abeed2ee55636c6906785b9de337
push id62994
push userbmo:giles@thaumas.net
push dateThu, 08 Jun 2017 20:11:04 +0000
reviewersmshal
bugs1371372
milestone55.0a1
Bug 1371372 - Remove cargo tarball naming work-around. r?mshal This is no longer necessary with the 1.18.0 release. MozReview-Commit-ID: 1IGQFuvRIzu
taskcluster/docker/rust-build/VERSION
taskcluster/docker/rust-build/repack_rust.py
--- a/taskcluster/docker/rust-build/VERSION
+++ b/taskcluster/docker/rust-build/VERSION
@@ -1,1 +1,1 @@
-0.4.5
+0.4.6
--- a/taskcluster/docker/rust-build/repack_rust.py
+++ b/taskcluster/docker/rust-build/repack_rust.py
@@ -2,17 +2,16 @@
 '''
 This script downloads and repacks official rust language builds
 with the necessary tool and target support for the Firefox
 build environment.
 '''
 
 import argparse
 import os.path
-import re
 import sys
 
 import requests
 import subprocess
 import toml
 
 
 def log(msg):
@@ -56,18 +55,16 @@ def fetch(url):
         ])
 
 
 def install(filename, target):
     '''Run a package's installer script against the given target directory.'''
     log('Unpacking %s...' % filename)
     subprocess.check_call(['tar', 'xf', filename])
     basename = filename.split('.tar')[0]
-    # Work around bad tarball naming in 1.15+ cargo packages.
-    basename = re.sub(r'cargo-0\.[\d\.]+', 'cargo-nightly', basename)
     log('Installing %s...' % basename)
     install_cmd = [os.path.join(basename, 'install.sh')]
     install_cmd += ['--prefix=' + os.path.abspath(target)]
     install_cmd += ['--disable-ldconfig']
     subprocess.check_call(install_cmd)
     log('Cleaning %s...' % basename)
     subprocess.check_call(['rm', '-rf', basename])