Author: glen Date: Mon Oct 23 20:13:26 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- avoid passing -bb to builder when attempting to get bconds
---- Files affected:
SPECS:
repackage.sh (1.8 -> 1.9)
---- Diffs:
================================================================
Index: SPECS/repackage.sh
diff -u SPECS/repackage.sh:1.8 SPECS/repackage.sh:1.9
--- SPECS/repackage.sh:1.8 Mon Oct 23 22:07:59 2006
+++ SPECS/repackage.sh Mon Oct 23 22:13:21 2006
@@ -14,16 +14,17 @@
/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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/repackage.sh?r1=1.8&r2=1.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
