[Lunar-commits] r20479 - lunar/trunk/var/lib/lunar/functions

[Auke Kok]

Author: sofar
Date: 2006-06-19 14:55:28 +0000 (Mon, 19 Jun 2006)
New Revision: 20479

Modified:
   lunar/trunk/var/lib/lunar/functions/download.lunar
Log:
Fix cvs downloading by not appending '/'.


Modified: lunar/trunk/var/lib/lunar/functions/download.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/download.lunar	2006-06-19 14:48:11 UTC (rev 20478)
+++ lunar/trunk/var/lib/lunar/functions/download.lunar	2006-06-19 14:55:28 UTC (rev 20479)
@@ -36,7 +36,7 @@
 download_url() {
 	local RETVAL
 	debug_msg "download_url($@)"
-	verbose_msg "trying to download \"${1%%/}/${2}\""
+	verbose_msg "trying to download \"${2}\" from \"${1}\""
 	connect &&
 	plugin_call SOURCE_DOWNLOAD $1 $2 $3
 	RETVAL=$?
@@ -47,7 +47,6 @@
 }
 
 
-
 download_module() {
 (
 	local MAX_SOURCES SRC ALL_URLS URLS URL MLIST ALT REST HIT
@@ -91,8 +90,7 @@
 		add_url() {
 			if [ -n "$1" ]; then
 				if ! echo " $ALL_URLS " | grep -q " $1 "; then
-					# make sure the URL has ONE "/" at the end
-					ALL_URLS="$ALL_URLS $(echo "$1/" | sed "s:[/]*$:/:g")"
+					ALL_URLS="$ALL_URLS $1"
 				fi
 			fi
 		}