[X2Go-Commits] [buildscripts] 14/14: bin/build-rpm-package: remove ${TEMP_DIR} cleanup now handled by the cleanup() function.

git-admin at x2go.org git-admin at x2go.org
Fri Apr 3 03:07:50 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 761a20155b9cddbd87821e18444534772613e9cd
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Apr 3 03:07:09 2015 +0200

    bin/build-rpm-package: remove ${TEMP_DIR} cleanup now handled by the cleanup() function.
---
 bin/build-rpm-package |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index eccfd7e..fe83537 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -666,7 +666,6 @@ build_packages() {
 						rm -Rf -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/rpmbuild/SRPMS/build.log"
 					else
 						cat "${PKGDIST}/${l_DIST}/${l_CODENAME}/rpmbuild/SRPMS/build.log"
-						rm -Rf -- "$TEMP_DIR"
 						exit 1
 					fi
 				fi
@@ -716,7 +715,6 @@ build_packages() {
 							done
 							rpmsign-unattended -D "%_gpg_name debian at x2go.org" --addsign "${PKGDIST}/${l_DIST}/${l_CODENAME}/SRPM/"*.rpm
 						else
-							rm -Rf -- "${TEMP_DIR}"
 							exit 1
 						fi
 					else
@@ -750,7 +748,6 @@ build_packages() {
 								cat "${PKGDIST}/${l_DIST}/${l_CODENAME}/x86_64/build.log"
 							else
 								cat "${PKGDIST}/${l_DIST}/${l_CODENAME}/x86_64/build.log"
-								rm -Rf -- "${TEMP_DIR}"
 								exit 1
 							fi
 						done
@@ -796,7 +793,6 @@ build_packages() {
 								rpmsign-unattended -D "%_gpg_name debian at x2go.org" --addsign "${PKGDIST}/${l_DIST}/${l_CODENAME}/SRPM/"*.rpm
 							fi
 						else
-							rm -Rf -- "${TEMP_DIR}"
 							exit 1
 						fi
 					else
@@ -831,7 +827,6 @@ build_packages() {
 								cat "${PKGDIST}/${l_DIST}/${l_CODENAME}/i386/build.log"
 							else
 								cat "${PKGDIST}/${l_DIST}/${l_CODENAME}/i386/build.log"
-								rm -Rf -- "${TEMP_DIR}"
 								exit 1
 							fi
 						done
@@ -840,7 +835,6 @@ build_packages() {
 			done
 		}
 	done
-	rm -Rf -- "${TEMP_DIR}"
 	return 0
 }
 

--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git


More information about the x2go-commits mailing list