[packages/rpm-build-tools] builder.sh: Prevent rpm from using internal downloader during cleaning

draenog draenog at pld-linux.org
Mon Apr 29 04:16:48 CEST 2013


commit 664084c6f711031947b0b6c8658f2973535e3629
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Mon Apr 29 03:06:15 2013 +0100

    builder.sh: Prevent rpm from using internal downloader during cleaning
    
    Rpm5 always tries to download missing sources, even during cleaning
    jobs. What's worse the its internal downloader sometimes hangs up
    indefinitely (see truecryp:e725751), which can lead to hang up jobs on
    builders.

 builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/builder.sh b/builder.sh
index a29cc13..5b5f58a 100755
--- a/builder.sh
+++ b/builder.sh
@@ -2108,7 +2108,7 @@ mr_proper() {
 	DONT_PRINT_REVISION="yes"
 
 	# remove spec and sources
-	PATH=$CLEAN_PATH $RPMBUILD --clean --rmsource --rmspec --nodeps --define "_specdir $PACKAGE_DIR" --define "_sourcedir $PACKAGE_DIR" --define "_builddir $builddir" $PACKAGE_DIR/$SPECFILE
+	PATH=$CLEAN_PATH $RPMBUILD --clean --rmsource --rmspec --nodeps --define "__urlgetfile() %nil" --define "_specdir $PACKAGE_DIR" --define "_sourcedir $PACKAGE_DIR" --define "_builddir $builddir" $PACKAGE_DIR/$SPECFILE
 	rm -rf $PACKAGE_DIR/{.git,.gitignore}
 	rmdir --ignore-fail-on-non-empty $PACKAGE_DIR
 }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/664084c6f711031947b0b6c8658f2973535e3629



More information about the pld-cvs-commit mailing list