Author: glen Date: Wed Nov 25 20:37:46 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- cleanup as SPECFILE is filename always
---- Files affected:
packages:
builder (1.599 -> 1.600)
---- Diffs:
================================================================
Index: packages/builder
diff -u packages/builder:1.599 packages/builder:1.600
--- packages/builder:1.599 Wed Nov 25 21:34:38 2009
+++ packages/builder Wed Nov 25 21:37:40 2009
@@ -683,7 +683,8 @@
cd "$REPO_DIR"
if [ ! -f "$ASSUMED_NAME/$SPECFILE" ]; then
- SPECFILE="$(basename $SPECFILE .spec).spec"
+ # XXX: still needed?
+ SPECFILE=$(basename $SPECFILE)
fi
if [ "$NOCVSSPEC" != "yes" ]; then
@@ -2226,7 +2227,7 @@
[ -d "$ASSUMED_NAME" ] && CVS_ENTRIES="$ASSUMED_NAME/CVS/Entries" ||
CVS_ENTRIES="CVS/Entries"
if [ -f "$CVS_ENTRIES" ] && [ -z "$CVSTAG" ]; then
- CVSTAG=$(awk -vSPECFILE=$(basename ${SPECFILE%.spec}.spec) -F/ '$2 ==
SPECFILE && $6 ~ /^T/{print substr($6, 2)}' ${CVS_ENTRIES})
+ CVSTAG=$(awk -vSPECFILE=$(basename $SPECFILE) -F/ '$2 == SPECFILE && $6
~ /^T/{print substr($6, 2)}' ${CVS_ENTRIES})
if [ "$CVSTAG" ]; then
echo >&2 "builder: Sticky tag $CVSTAG active. Use -r TAGNAME to
override."
fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.599&r2=1.600&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
