[yum-cvs] yum/yum repos.py,1.63,1.64

[Seth Vidal]

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

Modified Files:
	repos.py 
Log Message:

proxy fixes


Index: repos.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/repos.py,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- repos.py	17 Feb 2005 07:16:46 -0000	1.63
+++ repos.py	19 Feb 2005 22:28:23 -0000	1.64
@@ -368,17 +368,20 @@
             return
         
         self.proxy_dict = {} # zap it
-        if self.proxy is not None or self.proxy is not '_none_':
+        proxy_string = None
+        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)
                 if self.proxy_password is not None:
                     proxy_string = '%s:%s@%s' % (self.proxy_username,
                                                  self.proxy_password, self.proxy)
+                                                 
+        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"""