diff options
Diffstat (limited to 'buildscripts/packager_enterprise.py')
| -rwxr-xr-x | buildscripts/packager_enterprise.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py index ea89dc94633..25ceffc1dc2 100755 --- a/buildscripts/packager_enterprise.py +++ b/buildscripts/packager_enterprise.py @@ -28,7 +28,6 @@ # echo "Now put the dist gnupg signing keys in ~root/.gnupg" import errno -from glob import glob import os import re import shutil @@ -36,6 +35,8 @@ import sys import tempfile import time +from glob import glob + sys.path.append(os.getcwd()) import packager # pylint: disable=wrong-import-position @@ -254,8 +255,8 @@ def make_package(distro, build_os, arch, spec, srcdir): # FIXME: sh-dash-cee is bad. See if tarfile can do this. packager.sysassert([ "sh", "-c", - "(cd \"%s\" && git archive %s %s/ ) | (cd \"%s\" && tar xvf -)" % - (srcdir, spec.metadata_gitspec(), pkgdir, sdir) + "(cd \"%s\" && GIT_HASH=$(git stash create) && git archive \"${GIT_HASH}\" %s/ )" + "| (cd \"%s\" && tar xvf -)" % (srcdir, pkgdir, sdir) ]) # Splat the binaries under sdir. The "build" stages of the # packaging infrastructure will move the files to wherever they |