[yum-cvs] yum/yum repos.py,1.87,1.88 config.py,1.83,1.84

[Jeremy Katz]

Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv3248/yum

Modified Files:
	repos.py config.py 
Log Message:
only set options which have a value.  add more defaults.  fixes mirrorlists
(and other stuff) getting overwritten (#175436)


Index: repos.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/repos.py,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- repos.py	13 Dec 2005 06:16:03 -0000	1.87
+++ repos.py	14 Dec 2005 19:12:47 -0000	1.88
@@ -350,6 +350,13 @@
         self.cachedir = ""
         self.pkgdir = ""
         self.hdrdir = ""
+        self.retries = 0
+        self.bandwidth = 0
+        self.throttle = 0
+        self.timeout = 0
+        self.http_caching = 0
+        self.metadata_expire = 0
+        self.failovermethod = ""
 
         # holder for stuff we've grabbed
         self.retrieved = { 'primary':0, 'filelists':0, 'other':0, 'groups':0 }
@@ -536,7 +543,7 @@
             for url in mirrorurls:
                 url = parser.varReplace(url, self.yumvar)
                 self.baseurl.append(url)
-       
+
         for url in self.baseurl:
             url = parser.varReplace(url, self.yumvar)
             (s,b,p,q,f,o) = urlparse.urlparse(url)

Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- config.py	8 Dec 2005 23:24:53 -0000	1.83
+++ config.py	14 Dec 2005 19:12:47 -0000	1.84
@@ -502,7 +502,8 @@
     # Transfer attributes across
     #TODO: merge RepoConf and Repository 
     for k, v in conf.iteritems():
-        thisrepo.set(k, v)
+        if v:
+            thisrepo.set(k, v)
 
     # Set attributes not from the config file
     thisrepo.basecachedir = mainconf.cachedir