[yum-cvs] yum/yum repos.py,1.59.2.2,1.59.2.3

[Seth Vidal]

Update of /home/groups/yum/cvs/yum/yum
In directory login:/tmp/cvs-serv4877/yum

Modified Files:
      Tag: yum-2_2_X
	repos.py 
Log Message:

fix for bug 407


Index: repos.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/repos.py,v
retrieving revision 1.59.2.2
retrieving revision 1.59.2.3
diff -u -r1.59.2.2 -r1.59.2.3
--- repos.py	19 Feb 2005 22:27:42 -0000	1.59.2.2
+++ repos.py	7 Mar 2005 06:28:19 -0000	1.59.2.3
@@ -374,16 +374,23 @@
         if self.proxy not in [None, '_none_']:
             proxy_string = '%s' % self.proxy
             if self.proxy_username is not None:
-                proxy_string = '%s@%s' % (self.proxy_username, self.proxy)
+                proxy_parsed = urlparse.urlsplit(self.proxy, allow_fragments=0)
+                proxy_proto = proxy_parsed[0]
+                proxy_host = proxy_parsed[1]
+                proxy_rest = proxy_parsed[2] + '?' + proxy_parsed[3]
+                proxy_string = '%s://%s@%s%s' % (proxy_proto,
+                        self.proxy_username, proxy_host, proxy_rest)
+                        
                 if self.proxy_password is not None:
-                    proxy_string = '%s:%s@%s' % (self.proxy_username,
-                                                 self.proxy_password, self.proxy)
+                    proxy_string = '%s://%s:%s@%s%s' % (proxy_proto,
+                              self.proxy_username, self.proxy_password,
+                              proxy_host, proxy_rest)
                                                  
         if proxy_string is not None:
             self.proxy_dict['http'] = proxy_string
             self.proxy_dict['https'] = proxy_string
             self.proxy_dict['ftp'] = proxy_string
-
+        
     def setupGrab(self):
         """sets up the grabber functions with the already stocked in urls for
            the mirror groups"""