SPECS: builder - geturis are too long, truncate to first word

glen glen at pld-linux.org
Tue Jan 17 00:01:48 CET 2006


Author: glen                         Date: Mon Jan 16 23:01:48 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- geturis are too long, truncate to first word

---- Files affected:
SPECS:
   builder (1.372 -> 1.373) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.372 SPECS/builder:1.373
--- SPECS/builder:1.372	Mon Jan 16 23:46:23 2006
+++ SPECS/builder	Tue Jan 17 00:01:42 2006
@@ -719,32 +719,32 @@
 					url_attic=$(distfiles_attic_url "$i")
 					FROM_DISTFILES=1
 					if [ "`echo $url | grep -E '^(\.|/)'`" ]; then
-						update_shell_title "${GETLOCAL}: $url"
+						update_shell_title "${GETLOCAL%% *}: $url"
 						${GETLOCAL} $url $target
 					else
 						if [ -z "$NOMIRRORS" ]; then
 							url="`find_mirror "$url"`"
 						fi
-						update_shell_title "${GETURI}: $url"
+						update_shell_title "${GETURI%% *}: $url"
 						${GETURI} ${OUTFILEOPT} "$target" "$url" || \
 						if [ "`echo $url | grep -E 'ftp://'`" ]; then
-							update_shell_title "${GETURI2}: $url"
+							update_shell_title "${GETURI2%% *}: $url"
 							${GETURI2} ${OUTFILEOPT} "$target" "$url"
 						fi
 					fi
 					if ! test -s "$target"; then
 						rm -f "$target"
 						if [ `echo $url_attic | grep -E '^(\.|/)'` ]; then
-							update_shell_title "${GETLOCAL}: $url_attic"
+							update_shell_title "${GETLOCAL%% *}: $url_attic"
 							${GETLOCAL} $url_attic $target
 						else
 							if [ -z "$NOMIRRORS" ]; then
 								url_attic="`find_mirror "$url_attic"`"
 							fi
-							update_shell_title "${GETURI}: $url_attic"
+							update_shell_title "${GETURI%% *}: $url_attic"
 							${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \
 							if [ "`echo $url_attic | grep -E 'ftp://'`" ]; then
-								 update_shell_title "${GETURI2}: $url_attic"
+								 update_shell_title "${GETURI2%% *}: $url_attic"
 								${GETURI2} ${OUTFILEOPT} "$target" "$url_attic"
 							fi
 						fi
@@ -766,10 +766,10 @@
 					else
 						im="$i"
 					fi
-				 	update_shell_title "${GETURI}: $im"
+				 	update_shell_title "${GETURI%% *}: $im"
 					${GETURI} "$im" || \
 					if [ "`echo $im | grep -E 'ftp://'`" ]; then
-						 update_shell_title "${GETURI2}: $im"
+						 update_shell_title "${GETURI2%% *}: $im"
 						${GETURI2} "$im"
 					fi
 				fi
@@ -801,18 +801,18 @@
 				echo "MD5 sum mismatch. Trying full fetch."
 				FROM_DISTFILES=2
 				rm -f $target
-				update_shell_title "${GETURI}: $url"
+				update_shell_title "${GETURI%% *}: $url"
 				${GETURI} ${OUTFILEOPT} "$target" "$url" || \
 				if [ "`echo $url | grep -E 'ftp://'`" ]; then
-					 update_shell_title "${GETURI2}: $url"
+					 update_shell_title "${GETURI2%% *}: $url"
 					${GETURI2} ${OUTFILEOPT} "$target" "$url"
 				fi
 				if ! test -s "$target"; then
 					rm -f "$target"
-					update_shell_title "${GETURI}: $url_attic"
+					update_shell_title "${GETURI%% *}: $url_attic"
 					${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \
 					if [ "`echo $url_attic | grep -E 'ftp://'`" ]; then
-						 update_shell_title "${GETURI2}: $url_attic"
+						 update_shell_title "${GETURI2%% *}: $url_attic"
 						${GETURI2} ${OUTFILEOPT} "$target" "$url_attic"
 					fi
 				fi
================================================================

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



More information about the pld-cvs-commit mailing list