Merge pull request #1312 from /issues/2925-0.61.x

Make Cargo download check more reliable 0.61.x
brave · Jan 14, 2019 · 1365633 · 1365633
2 parents f5a7698 + 6501a89
commit 1365633
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/script/download_rust_deps.py b/script/download_rust_deps.py
@@ -15,7 +15,8 @@
 from rust_deps_config import RUST_DEPS_PACKAGES_URL, RUST_DEPS_PACKAGE_VERSION
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-RUSTUP_DIR = os.path.join(SOURCE_ROOT, 'build', 'rustup', RUST_DEPS_PACKAGE_VERSION)
+RUSTUP_DIR = os.path.join(SOURCE_ROOT, 'build', 'rustup')
+RUST_DEPS_DIR = os.path.join(RUSTUP_DIR, RUST_DEPS_PACKAGE_VERSION)
 
 
 def GetUrl(platform):
@@ -34,7 +35,7 @@ def GetUrl(platform):
 
 
 def AlreadyUpToDate():
-    if not os.path.exists(RUSTUP_DIR):
+    if not os.path.exists(RUST_DEPS_DIR):
         return False
 
     return True
@@ -49,7 +50,7 @@ def DownloadAndUnpackRustDeps(platform):
     try:
         deps.DownloadAndUnpack(url, RUSTUP_DIR)
     except urllib2.URLError:
-        print 'Failed to download Rust deps %s' % rust_deps_url
+        print 'Failed to download Rust deps %s' % url
         print 'Exiting.'
         sys.exit(1)
 

diff --git a/script/rust_deps_config.py b/script/rust_deps_config.py
@@ -5,4 +5,4 @@
 
 # Version number and URL for pre-configured rust dependency package, e.g. rust_deps_mac_0.1.0.gz
 RUST_DEPS_PACKAGES_URL = "https://s3-us-west-2.amazonaws.com/rust-pkg-brave-core"
-RUST_DEPS_PACKAGE_VERSION = "0.1.0"
+RUST_DEPS_PACKAGE_VERSION = "0.1.1"