Merge staging without python splitting for now

The split needs more time to finish rebuilding, but the rest seems OK and there are security fixes.
2016-10-14 09:24:21 +02:00
parent e0210d7cbf 3eec7ea3f0
commit 027efec879
29 changed files with 101 additions and 113 deletions
@@ -538,8 +538,7 @@ rec {

      # Hacky: RPM looks for <basename>.spec inside the tarball, so
      # strip off the hash.
-      stripHash "$src"
-      srcName="$strippedName"
+      srcName="$(stripHash "$src")"
      cp "$src" "$srcName" # `ln' doesn't work always work: RPM requires that the file is owned by root

      export HOME=/tmp/home