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
--- 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])