[packages/rpm-build-tools] cleanup GIT_ vars before invoking build
glen
glen at pld-linux.org
Sat Dec 19 01:55:42 CET 2015
commit bfea86a560b05eceb78e8c70468d92c1e7124d17
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Dec 19 02:54:47 2015 +0200
cleanup GIT_ vars before invoking build
builder.sh | 7 +++++++
1 file changed, 7 insertions(+)
---
diff --git a/builder.sh b/builder.sh
index 3c9a336..a1f870b 100755
--- a/builder.sh
+++ b/builder.sh
@@ -1650,6 +1650,13 @@ build_package() {
fi
fi
+ # unset these, should not be exposed to builder shell!
+ unset GIT_WORK_TREE GIT_DIR
+ # thse are set by jenkins
+ unset GIT_PREVIOUS_COMMIT GIT_URL GIT_PREVIOUS_SUCCESSFUL_COMMIT GIT_BRANCH GIT_COMMIT
+ # fail if something still set
+ env | grep ^GIT_ && Exit_error err_build_fail
+
local specdir=$(insert_gitlog $SPECFILE)
# FIXME: eval here is exactly why?
PATH=$CLEAN_PATH eval teeboth "'$logfile'" ${TIME_COMMAND} ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $specdir/$SPECFILE
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/8089559cfde724a615d3c15b48e732930f687bbf
More information about the pld-cvs-commit
mailing list