builder: unset GIT_SSH

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 5ff6848c69b234a0ea651fcaf4231729e4c775f0..9360e7f36a72bd1a1ec93b8d92f4506f8267f6f7 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -1011,7 +1011,7 @@ get_spec() {
 
                # create symlinks for tools
                if [ "$SYMLINK_TOOLS" != "no" -a -d "$PACKAGE_DIR" ]; then
-                       for a in dropin md5 adapter builder {relup,compile,repackage,rsync,pearize}.sh; do
+                       for a in dropin md5 builder {relup,compile,repackage,rsync,pearize}.sh; do
                                # skip tools that don't exist in top dir
                                [ -f $a ] || continue
                                # skip tools that already exist
@@ -1664,6 +1664,8 @@ build_package() {
        unset GIT_WORK_TREE GIT_DIR
        # these are set by jenkins
        unset GIT_PREVIOUS_COMMIT GIT_URL GIT_PREVIOUS_SUCCESSFUL_COMMIT GIT_BRANCH GIT_COMMIT
+       # this may be set by user
+       unset GIT_SSH
        # fail if something still set
        env | grep ^GIT_ && Exit_error err_build_fail
 
@@ -2054,7 +2056,7 @@ init_rpm_dir() {
        cd "$TOP_DIR"
        init_repository ${PACKAGES_DIR}/rpm-build-tools.git ../rpm-build-tools
        init_repository projects/$TEMPLATES ../$TEMPLATES
-       for a in adapter builder fetchsrc_request compile repackage; do
+       for a in builder fetchsrc_request compile repackage; do
                ln -sf ../rpm-build-tools/${a}.sh $a
        done
        for a in md5; do