Revert non-license changes as part of 0ebe112b

The commit accidentally modified the snapshot script which changed its behavior
and is currently blocking a snapshot.
This commit is contained in:
Alex Crichton 2014-02-10 18:00:40 -08:00
parent 38ed4674e8
commit c2ae62faee
1 changed files with 109 additions and 107 deletions

View File

@ -39,7 +39,8 @@ snapshot_files = {
"freebsd": ["bin/rustc"],
}
winnt_runtime_deps = ["libgcc_s_dw2-1.dll", "libstdc++-6.dll"]
winnt_runtime_deps = ["libgcc_s_dw2-1.dll",
"libstdc++-6.dll"]
def parse_line(n, line):
global snapshotfile
@ -55,11 +56,11 @@ def parse_line(n, line):
"hash": match.group(2).lower() }
match = re.match(r"([ST]) (\d{4}-\d{2}-\d{2}) ([a-fA-F\d]+)\s*$", line);
if not match:
if (not match):
raise Exception("%s:%d:E syntax error: " % (snapshotfile, n))
return { "type": "snapshot",
return {"type": "snapshot",
"date": match.group(2),
"rev": match.group(3) }
"rev": match.group(3)}
def partial_snapshot_name(date, rev, platform):
@ -93,7 +94,8 @@ def get_platform(triple):
def cmd_out(cmdline):
p = subprocess.Popen(cmdline, stdout=subprocess.PIPE)
p = subprocess.Popen(cmdline,
stdout=subprocess.PIPE)
return scrub(p.communicate()[0].strip())