Author: arekm Date: Wed Sep 16 13:14:16 2009 GMT
Module: packages Tag: HEAD
---- Log message:
Or just use target variable...
---- Files affected:
packages:
builder (1.593 -> 1.594)
---- Diffs:
================================================================
Index: packages/builder
diff -u packages/builder:1.593 packages/builder:1.594
--- packages/builder:1.593 Wed Sep 16 15:00:44 2009
+++ packages/builder Wed Sep 16 15:14:11 2009
@@ -1015,13 +1015,13 @@
if echo $i | grep -vE
'(http|ftp|https|cvs|svn)://' | grep -qE '\.(gz|bz2)$']; then
echo "Warning: no URL given for $i"
fi
+ target="$fp"
if [ -z "$NODIST" ] && [ -n "$srcmd5" ]; then
if good_md5 "$i" && good_size "$i"; then
echo "$fp having proper md5sum
already exists"
continue
fi
- target="$fp"
# optionally prefer mirror over
distfiles if there's mirror
# TODO: build url list and then try
each url from the list
@@ -1098,12 +1098,11 @@
else
im="$i"
fi
- lf=$(basename $im)
update_shell_title "${GETURI%% *}: $im"
- ${GETURI} "$im" ${OUTFILEOPT} "$lf" || \
+ ${GETURI} "$im" ${OUTFILEOPT} "$target"
|| \
if [ "`echo $im | grep -E 'ftp://'`" ];
then
update_shell_title "${GETURI2%%
*}: $im"
- ${GETURI2} "$im" ${OUTFILEOPT}
"$lf"
+ ${GETURI2} "$im" ${OUTFILEOPT}
"$target"
fi
fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.593&r2=1.594&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
