From 8d92c6f70268c56e3351d01cd9fd2351e27d0bc9 Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Sat, 23 Jun 2007 18:47:55 +0000 Subject: dont break when the binhost url doesn't end with a slash (bug #144440) svn path=/main/trunk/; revision=6978 --- pym/portage/getbinpkg.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pym') diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py index 410a48577..808eb64f9 100644 --- a/pym/portage/getbinpkg.py +++ b/pym/portage/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: -- cgit v1.2.3-1-g7c22