auto merge of #7913 : brson/rust/rm-install-snap, r=graydon

mk/snap.mk

@@ -12,13 +12,8 @@ define DEF_SNAP_FOR_STAGE_H
 # $(1) stage
 # $(2) triple
 
-ifdef CFG_INSTALL_SNAP
-snap-stage$(1)-H-$(2): $$(HSREQ$(1)_H_$(2))
-	$(CFG_PYTHON) $(S)src/etc/make-snapshot.py stage$(1) $(2) install
-else
 snap-stage$(1)-H-$(2): $$(HSREQ$(1)_H_$(2))
 	$(CFG_PYTHON) $(S)src/etc/make-snapshot.py stage$(1) $(2)
-endif
 
 endef
 

src/etc/make-snapshot.py

@@ -3,7 +3,4 @@
 
 import snapshot, sys
 
-if len(sys.argv) == 3:
-    print(snapshot.make_snapshot(sys.argv[1], sys.argv[2], ""))
-else:
-    print(snapshot.make_snapshot(sys.argv[1], sys.argv[2], sys.argv[3]))
+print(snapshot.make_snapshot(sys.argv[1], sys.argv[2]))

src/etc/snapshot.py

@@ -156,7 +156,7 @@ def hash_file(x):
     return scrub(h.hexdigest())
 
 
-def make_snapshot(stage, triple, flag):
+def make_snapshot(stage, triple):
     kernel = get_kernel(triple)
     platform = get_platform(triple)
     rev = local_rev_short_sha()
@@ -190,33 +190,4 @@ def in_tar_name(fn):
 
     shutil.move(file0, file1)
 
-    if flag == "install":
-      # FIXME (#2664): this is an ugly quick hack; pls make it better
-      path  = file1
-      comps = path.split("-")
-      parts = { 'year': comps[2], \
-                'month': comps[3], \
-                'date': comps[4], \
-                'check': comps[5], \
-                'plat': comps[6], \
-                'arch': comps[7], \
-                'sha': comps[8].split(".")[0] }
-
-      shutil.move(path, "dl/" + path)
-      shutil.move('src/snapshots.txt', 'src/snapshots-old.txt')
-
-      newf = open('src/snapshots.txt', 'w')
-      newf.write("T %(year)s-%(month)s-%(date)s %(check)s\n" % parts)
-      newf.write("  %(plat)s-%(arch)s %(sha)s\n\n" % parts)
-
-      oldf = open('src/snapshots-old.txt', 'r')
-      for line in oldf:
-        newf.write(line)
-      oldf.close()
-
-      newf.close()
-
-      os.remove('src/snapshots-old.txt')
-
-
     return file1