[yum-cvs] yum/yum config.py,1.44,1.45 repos.py,1.68,1.69

[Seth Vidal]

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

Modified Files:
	config.py repos.py 
Log Message:

fix for bug 407
delete some commented code in config.py


Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- config.py	17 Feb 2005 07:16:46 -0000	1.44
+++ config.py	7 Mar 2005 06:27:56 -0000	1.45
@@ -299,16 +299,6 @@
         for option in ['exclude', 'installonlypkgs', 'kernelpkgnames', 'tsflags']:
             self.configdata[option] = parseList(self.configdata[option])
 
-
-
-
-                    
-        # if we don't have any enabled repositories then this is going to suck
-        # bail out with an exception raised so yummain can catch it
-#        if len(self.repos.listEnabled()) < 1:
-#            raise Errors.ConfigError, \
-#                    'Insufficient repository configuration. No repositories Found/Enabled. Aborting.'
-
     def listConfigOptions(self):
         """return list of options available for global config"""
         return self.configdata.keys()

Index: repos.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/repos.py,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- repos.py	2 Mar 2005 22:18:43 -0000	1.68
+++ repos.py	7 Mar 2005 06:27:56 -0000	1.69
@@ -396,10 +396,17 @@
         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
@@ -507,7 +514,7 @@
         prxy = None
         if self.proxy_dict:
             prxy = self.proxy_dict
-
+            print prxy
         if url is not None:
             ug = URLGrabber(keepalive = self.keepalive, 
                             bandwidth = self.bandwidth,