Merge recent 'staging' into closure-size

Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
parent c979012631 53e0f8b1cd
commit ae74c356d9
637 changed files with 123880 additions and 83341 deletions
@@ -27,5 +27,7 @@ updateSourceDateEpoch() {
 postUnpackHooks+=(_updateSourceDateEpochFromSourceRoot)

 _updateSourceDateEpochFromSourceRoot() {
-    updateSourceDateEpoch "$sourceRoot"
+    if [ -n "$sourceRoot" ]; then
+        updateSourceDateEpoch "$sourceRoot"
+    fi
 }