diff options
| author | auto-revert-processor <dev-prod-dag@mongodb.com> | 2023-04-13 00:12:57 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-04-13 01:17:06 +0000 |
| commit | 1aa14a2a9200a57cd810dda827277bf204927c05 (patch) | |
| tree | 9c52131d568e01e8e9bc7abff0a7bbbb56d12648 /buildscripts/packager_enterprise.py | |
| parent | dc74aa4451556377e83d4f645cf5c2f8c61ab38c (diff) | |
| download | mongo-1aa14a2a9200a57cd810dda827277bf204927c05.tar.gz | |
Revert "SERVER-70425 Stash before using git archive"
This reverts commit 677dd87ca6f923f38dd9c5f4b1120d76203a72b7.
Diffstat (limited to 'buildscripts/packager_enterprise.py')
| -rwxr-xr-x | buildscripts/packager_enterprise.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py index 25ceffc1dc2..ea89dc94633 100755 --- a/buildscripts/packager_enterprise.py +++ b/buildscripts/packager_enterprise.py @@ -28,6 +28,7 @@ # echo "Now put the dist gnupg signing keys in ~root/.gnupg" import errno +from glob import glob import os import re import shutil @@ -35,8 +36,6 @@ import sys import tempfile import time -from glob import glob - sys.path.append(os.getcwd()) import packager # pylint: disable=wrong-import-position @@ -255,8 +254,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_HASH=$(git stash create) && git archive \"${GIT_HASH}\" %s/ )" - "| (cd \"%s\" && tar xvf -)" % (srcdir, pkgdir, sdir) + "(cd \"%s\" && git archive %s %s/ ) | (cd \"%s\" && tar xvf -)" % + (srcdir, spec.metadata_gitspec(), pkgdir, sdir) ]) # Splat the binaries under sdir. The "build" stages of the # packaging infrastructure will move the files to wherever they |