Author: glen                         Date: Sat Mar  3 14:41:02 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix bootstrap

---- Files affected:
SPECS:
   builder (1.480 -> 1.481) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.480 SPECS/builder:1.481
--- SPECS/builder:1.480 Fri Feb 23 21:35:12 2007
+++ SPECS/builder       Sat Mar  3 15:40:57 2007
@@ -537,6 +537,9 @@
                        remove_build_requires
                        echo "ERROR: spec file name not specified."
                        exit 2 ;;
+               "err_invalid_cmdline" )
+                       echo "ERROR: invalid command line arg ($2)."
+                       exit 2 ;;
                "err_no_spec_in_repo" )
                        remove_build_requires
                        echo "Error: spec file not stored in CVS repo."
@@ -2015,7 +2018,11 @@
                        RPMOPTS="${RPMOPTS} --nodeps"
                        ;;
                -debug)
-                       RPMBUILDOPTS="${RPMBUILDOPTS} -debug"; shift ;;
+                       RPMBUILDOPTS="${RPMBUILDOPTS} -debug"; shift
+                       ;;
+               -* )
+                       Exit_error err_invalid_cmdline "$1"
+                       ;;
                * )
                        SPECFILE="${1}"
                        # check if specname was passed as specname:cvstag
@@ -2027,7 +2034,7 @@
        esac
 done
 
-if [ -z "$CVSTAG" ]; then
+if [ -f CVS/Entries ] && [ -z "$CVSTAG" ]; then
        CVSTAG=$(awk -vSPECFILE="${SPECFILE%.spec}.spec" -F/ '$2 == SPECFILE && 
$6 ~ /^T/{print substr($6, 2)}' CVS/Entries)
        if [ "$CVSTAG" ]; then
                echo >&2 "builder: Stick tag $CVSTAG active. Use -r TAGNAME to 
override."
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/builder?r1=1.480&r2=1.481&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to