packages: builder Check for name/CVS dir when looking for sticky name. Old ...

[arekm]

Author: arekm                        Date: Thu Mar  8 21:03:48 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
Check for name/CVS dir when looking for sticky name. Old test failed if under name we had subdir with the same name.

---- Files affected:
packages:
   builder (1.672 -> 1.673) 

---- Diffs:

================================================================
Index: packages/builder
diff -u packages/builder:1.672 packages/builder:1.673
--- packages/builder:1.672	Tue Feb 28 12:41:33 2012
+++ packages/builder	Thu Mar  8 22:03:42 2012
@@ -2463,7 +2463,7 @@
 	esac
 done
 
-[ -d "$ASSUMED_NAME" ] && CVS_ENTRIES="$ASSUMED_NAME/CVS/Entries" || CVS_ENTRIES="CVS/Entries"
+[ -d "$ASSUMED_NAME/CVS" ] && CVS_ENTRIES="$ASSUMED_NAME/CVS/Entries" || CVS_ENTRIES="CVS/Entries"
 if [ -f "$CVS_ENTRIES" ] && [ -z "$CVSTAG" ]; then
 	CVSTAG=$(awk -vSPECFILE=$(basename $SPECFILE) -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' ${CVS_ENTRIES})
 	if [ "$CVSTAG" ]; then
================================================================

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