SPECS: builder - reverted last change - if no-init given set SPECS...
baggins
baggins at pld-linux.org
Tue Apr 25 17:30:34 CEST 2006
Author: baggins Date: Tue Apr 25 15:30:33 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- reverted last change
- if no-init given set SPECS/SOURCES dirs to . in cache_rpm_dump
---- Files affected:
SPECS:
builder (1.422 -> 1.423)
---- Diffs:
================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.422 SPECS/builder:1.423
--- SPECS/builder:1.422 Tue Apr 25 17:26:19 2006
+++ SPECS/builder Tue Apr 25 17:30:28 2006
@@ -406,7 +406,12 @@
ARGS='--nodigest --nosignature --nobuild'
;;
esac
- $RPMBUILD --rcfile .builder-rpmrc $ARGS --nodeps --define "prep $dump" $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE 2>&1
+ if [ "$NOINIT" != "yes" ] ; then
+ ARGDIRS=''
+ else
+ ARGDIRS='--define "_specdir ." --define "_sourcedir ."'
+ fi
+ $RPMBUILD --rcfile .builder-rpmrc $ARGS $ARGDIRS --nodeps --define "prep $dump" $BCOND $TARGET_SWITCH $SPECFILE 2>&1
`
if [ $? -gt 0 ]; then
error=$(echo "$rpm_dump" | sed -ne '/^error:/,$p')
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/builder?r1=1.422&r2=1.423&f=u
More information about the pld-cvs-commit
mailing list