From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 24 Jun 2007 21:11:47 +0000 (-0000)
Subject: dont break when the binhost url doesn't end with a slash (bug #144440, trunk r6978)
X-Git-Tag: v2.1.3~155
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=04499f22f8a520f2a94044e47304d377f2a55398;p=portage.git

dont break when the binhost url doesn't end with a slash (bug #144440, trunk r6978)

svn path=/main/branches/2.1.2/; revision=7003
---

diff --git a/pym/getbinpkg.py b/pym/getbinpkg.py
index 8c42c42bf..a506f4a13 100644
--- a/pym/getbinpkg.py
+++ b/pym/getbinpkg.py
@@ -78,14 +78,20 @@ def create_conn(baseurl,conn=None):
 	"""(baseurl,conn) --- Takes a protocol://site:port/address url, and an
 	optional connection. If connection is already active, it is passed on.
 	baseurl is reduced to address and is returned in tuple (conn,address)"""
+
 	parts = baseurl.split("://",1)
 	if len(parts) != 2:
 		raise ValueError, "Provided URL does not contain protocol identifier. '%s'" % baseurl
 	protocol,url_parts = parts
 	del parts
-	host,address = url_parts.split("/",1)
+
+	url_parts = url_parts.split("/")
+	host = url_parts[0]
+	if len(url_parts) < 2:
+		address = "/"
+	else:
+		address = "/"+"/".join(url_parts[1:])
 	del url_parts
-	address = "/"+address
 
 	userpass_host = host.split("@",1)
 	if len(userpass_host) == 1: