Fix package desyncing #7

Author: brson

master/master.cfg

@@ -1320,16 +1320,13 @@ def packaging_dist_buildfactory(platform, channel_label):
 
     # Get the id to use to uniquely identify this revision. In the
     # other dist builds this is the commit sha. Here though we're
-    # going to hash the source tarball (because that's what we've got
-    # on hand).  When all platforms have synced with this id then
-    # we'll upload. Sadly, cksum is the only command that seems to
-    # exist everywhere (for some reason I can't get shasum to
-    # work...). Routing stderr to /dev/null is to work around a
-    # mysterious bug on windows where cksum thinks I'm trying to sum a
+    # going to use the hash from the version file.
+    # Routing stderr to /dev/null is to work around a
+    # mysterious bug on windows where cat thinks I'm trying to pipe
     # file called '^'.
-    source_hash = "cksum in/rust-*-src.tar.gz 2> /dev/null | head -c8"
+    source_id = "cat tmp/work/rustc-*/version 2> /dev/null | sed 's/^.*(\([a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]\).*/\1/'"
     f.addStep(SetPropertyFromCommand(env=CommandEnv(),
-                                     command=["sh", "-c", source_hash],
+                                     command=["sh", "-c", source_id],
                                      property="commit_id",
                                      workdir=WORKDIR))