packages: builder - always have SPECFILE ending with .spec extension, or 'b...

glen glen at pld-linux.org
Wed Nov 25 21:34:43 CET 2009


Author: glen                         Date: Wed Nov 25 20:34:43 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- always have SPECFILE ending with .spec extension, or 'builder -g mailcap' will try to parse packages/maillcap/mailcap as .spec file

---- Files affected:
packages:
   builder (1.598 -> 1.599) 

---- Diffs:

================================================================
Index: packages/builder
diff -u packages/builder:1.598 packages/builder:1.599
--- packages/builder:1.598	Wed Nov 18 22:56:09 2009
+++ packages/builder	Wed Nov 25 21:34:38 2009
@@ -2212,14 +2212,15 @@
 			Exit_error err_invalid_cmdline "$1"
 			;;
 		*)
-			SPECFILE="${1}"
+			SPECFILE=$1; shift
 			# check if specname was passed as specname:cvstag
 			if [ "${SPECFILE##*:}" != "${SPECFILE}" ]; then
 				CVSTAG="${SPECFILE##*:}"
 				SPECFILE="${SPECFILE%%:*}"
 			fi
+			# always have SPECFILE ending with .spec extension
+			SPECFILE=${SPECFILE%%.spec}.spec
 			ASSUMED_NAME=$(basename ${SPECFILE%%.spec})
-			shift
 	esac
 done
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.598&r2=1.599&f=u



More information about the pld-cvs-commit mailing list