Skip to content

Commit 4ac2542

Browse files
committed
Merge pull request #1583 from killerswan/ubuntu_ppa
Additions re: Ubuntu PPA for Rust
2 parents 4efdab0 + 62bef76 commit 4ac2542

File tree

2 files changed

+60
-0
lines changed

2 files changed

+60
-0
lines changed

Makefile.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,12 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),)
493493
endif
494494

495495
ifneq ($(findstring install,$(MAKECMDGOALS)),)
496+
ifdef DESTDIR
497+
CFG_INFO := $(info cfg: setting CFG_PREFIX via DESTDIR, $(DESTDIR))
498+
CFG_PREFIX:=$(DESTDIR)
499+
export CFG_PREFIX
500+
endif
501+
496502
CFG_INFO := $(info cfg: including install rules)
497503
include $(CFG_SRC_DIR)/mk/install.mk
498504
endif

src/etc/latest-unix-snaps.py

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
#!/usr/bin/env python
2+
3+
import os, tarfile, hashlib, re, shutil, sys
4+
from snapshot import *
5+
6+
f = open(snapshotfile)
7+
date = None
8+
rev = None
9+
platform = None
10+
snap = None
11+
i = 0
12+
13+
newestSet = {}
14+
15+
16+
for line in f.readlines():
17+
i += 1
18+
parsed = parse_line(i, line)
19+
if (not parsed): continue
20+
21+
if parsed["type"] == "snapshot":
22+
if (len(newestSet) == 0 or parsed["date"] > newestSet["date"]):
23+
newestSet["date"] = parsed["date"]
24+
newestSet["rev"] = parsed["rev"]
25+
newestSet["files"] = []
26+
addingMode = True
27+
else:
28+
addingMode = False
29+
30+
elif addingMode == True and parsed["type"] == "file":
31+
tux = re.compile("linux", re.IGNORECASE)
32+
if (tux.match(parsed["platform"]) != None):
33+
ff = {}
34+
ff["platform"] = parsed["platform"]
35+
ff["hash"] = parsed["hash"]
36+
newestSet["files"] += [ff]
37+
38+
39+
def download_new_file (date, rev, platform, hsh):
40+
snap = full_snapshot_name(date, rev, platform, hsh)
41+
dl = os.path.join(download_dir_base, snap)
42+
url = download_url_base + "/" + snap
43+
if (not os.path.exists(dl)):
44+
print("downloading " + url)
45+
get_url_to_file(url, dl)
46+
if (snap_filename_hash_part(snap) == hash_file(dl)):
47+
print("got download with ok hash")
48+
else:
49+
raise Exception("bad hash on download")
50+
51+
for ff in newestSet["files"]:
52+
download_new_file (newestSet["date"], newestSet["rev"], ff["platform"], ff["hash"])
53+
54+

0 commit comments

Comments
 (0)