packages: builder - avoid shell errors if $LOGFILE is not set in initial pa...

glen glen at pld-linux.org
Thu Sep 2 22:00:33 CEST 2010


Author: glen                         Date: Thu Sep  2 20:00:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- avoid shell errors if $LOGFILE is not set in initial package checkout

---- Files affected:
packages:
   builder (1.630 -> 1.631) 

---- Diffs:

================================================================
Index: packages/builder
diff -u packages/builder:1.630 packages/builder:1.631
--- packages/builder:1.630	Mon Aug 30 17:03:39 2010
+++ packages/builder	Thu Sep  2 22:00:27 2010
@@ -747,8 +747,8 @@
 			rm -f "$ASSUMED_NAME/CVS/Entries.Static"
 			cvsignore_df .cvsignore
 
-			# add default log format to .cvsignore if it is relative
-			if [ "$LOGFILE" = $(basename "$LOGFILE") ]; then
+			# add default log format to .cvsignore if it is relative to package dir
+			if [ -n "$LOGFILE" -a "$LOGFILE" = "${LOGFILE##*/}" ]; then
 				# substitute known "macros" to glob
 				local logfile=$(echo "$LOGFILE" | sed -e 's,\$\(PACKAGE_NAME\|DATE\),*,g')
 				if [ "$logfile" ]; then
================================================================

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



More information about the pld-cvs-commit mailing list