Skip to content

Commit

Permalink
Auto merge of #21316 - servo:jdm-patch-27, r=Manishearth
Browse files Browse the repository at this point in the history
mach: Avoid python error when there's no cargo cache.

This happens when we have a newly provisioned machine.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21316)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Aug 2, 2018
2 parents 451c52e + 6ad63b5 commit 5c5ed54
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions python/servo/bootstrap_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -366,14 +366,15 @@ def get_size(path):
elif os.path.isdir(path.join(git_db_dir, d)):
packages["git"][crate_name]["exist"].append(("del", d, ""))

for d in os.listdir(crates_src_dir):
crate_name = re.sub(r"\-\d+(\.\d+){1,3}.+", "", d)
if not packages["crates"].get(crate_name, False):
packages["crates"][crate_name] = {
"current": [],
"exist": [],
}
packages["crates"][crate_name]["exist"].append(d)
if crates_src_dir:
for d in os.listdir(crates_src_dir):
crate_name = re.sub(r"\-\d+(\.\d+){1,3}.+", "", d)
if not packages["crates"].get(crate_name, False):
packages["crates"][crate_name] = {
"current": [],
"exist": [],
}
packages["crates"][crate_name]["exist"].append(d)

total_size = 0
for packages_type in ["git", "crates"]:
Expand Down

0 comments on commit 5c5ed54

Please sign in to comment.