Omit user:pass@ from binhost Packages cache path.

[portage.git] / pym / portage / dbapi / bintree.py

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 68d6845dbc961822b9ad3f3acce6408236db4ea8..2da7799e892d9c8adabb7841fc0719f9a4ce7d5f 100644 (file)
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -733,6 +733,14 @@ class binarytree(object):
                        parsed_url = urlparse(base_url)
                        host = parsed_url.netloc
                        port = parsed_url.port
+                       user = None
+                       passwd = None
+                       user_passwd = ""
+                       if "@" in host:
+                               user, host = host.split("@", 1)
+                               user_passwd = user + "@"
+                               if ":" in user:
+                                       user, passwd = user.split(":", 1)
                        port_args = []
                        if port is not None:
                                port_str = ":%s" % (port,)
@@ -775,7 +783,7 @@ class binarytree(object):
                                                if port is not None:
                                                        port_args = ['-P', "%s" % (port,)]
                                                proc = subprocess.Popen(['sftp'] + port_args + \
-                                                       [host + ":" + path, tmp_filename])
+                                                       [user_passwd + host + ":" + path, tmp_filename])
                                                if proc.wait() != os.EX_OK:
                                                        raise
                                                f = open(tmp_filename, 'rb')
@@ -783,7 +791,8 @@ class binarytree(object):
                                                if port is not None:
                                                        port_args = ['-p', "%s" % (port,)]
                                                proc = subprocess.Popen(['ssh'] + port_args + \
-                                                       [host, '--', 'cat', path], stdout=subprocess.PIPE)
+                                                       [user_passwd + host, '--', 'cat', path],
+                                                       stdout=subprocess.PIPE)
                                                f = proc.stdout
                                        else:
                                                raise