SPECS: builder - unbreak fetching sources with urls

glen glen at pld-linux.org
Tue Jan 17 00:43:41 CET 2006


Author: glen                         Date: Mon Jan 16 23:43:41 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unbreak fetching sources with urls

---- Files affected:
SPECS:
   builder (1.376 -> 1.377) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.376 SPECS/builder:1.377
--- SPECS/builder:1.376	Tue Jan 17 00:29:54 2006
+++ SPECS/builder	Tue Jan 17 00:43:36 2006
@@ -658,6 +658,7 @@
 		local get_files_cvs=""
 		for i in "$@"; do
 			nc=$((nc + 1))
+			local cvsup=0
 			SHELL_TITLE_PREFIX="get_files[$nc/$#]"
 			update_shell_title "$i"
 			local fp=`nourl "$i"`
@@ -725,8 +726,9 @@
 						FROM_DISTFILES=0
 					fi
 				elif [ -z "$(src_md5 "$i")" -a "$NOCVS" != "yes" ]; then
-				   get_files_cvs="$get_files_cvs $fp"
-					continue
+				    get_files_cvs="$get_files_cvs $fp"
+				   	# we'll do cvs up later
+					cvsup=1
 				fi
 
 				if [ -z "$NOURLS" ] && [ ! -f "$fp" -o -n "$UPDATE" ] && [ "`echo $i | grep -E 'ftp://|http://|https://'`" ]; then
@@ -741,6 +743,10 @@
 						 update_shell_title "${GETURI2%% *}: $im"
 						${GETURI2} "$im"
 					fi
+				fi
+
+				if [ "$cvsup" = 1 ]; then
+					continue
 				fi
 
 			fi
================================================================

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



More information about the pld-cvs-commit mailing list