]> git.pld-linux.org Git - packages/rpm-build-tools.git/commitdiff
- avoid passing -bb to builder when attempting to get bconds
authorElan Ruusamäe <glen@pld-linux.org>
Mon, 23 Oct 2006 20:13:21 +0000 (20:13 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    repackage.sh -> 1.9

repackage.sh

index d5e5bfba02527c71382720c246773d13e4b92b6a..53e529c885a1e92984314673539364e41de6b651 100644 (file)
@@ -14,18 +14,19 @@ rpmbuild() {
        /usr/bin/rpmbuild ${TARGET:+--target $TARGET} $BCONDS --short-circuit --define '_source_payload w9.gzdio' "$@" || exit
 }
 
-BCONDS=$(./builder --show-bconds "$@")
-# ignore output from older builders whose output is not compatible.
-if [ "$(echo "$bconds" | wc -l)" -gt 1 ]; then
-       BCONDS=""
-fi
+specfile="$1"
 
-SPECFILE="$1"
-tmp=$(awk '/^BuildArch:/ { print $NF}' $SPECFILE)
+tmp=$(awk '/^BuildArch:/ { print $NF}' $specfile)
 if [ "$tmp" ]; then
        TARGET="$tmp"
 fi
 
+BCONDS=$(./builder --show-bconds $specfile)
+# ignore output from older builders whose output is not compatible.
+if [ "$(echo "$bconds" | wc -l)" -gt 1 ]; then
+       BCONDS=""
+fi
+
 # just create the rpm's if -bb is somewhere in the args
 if [[ *$@* != *-bb* ]]; then
        rpmbuild -bi "$@"
This page took 0.034698 seconds and 4 git commands to generate.