[yum-cvs] yum/yum config.py,1.84,1.85 repos.py,1.88,1.89

[Jeremy Katz]

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

Modified Files:
	config.py repos.py 
Log Message:
better fix for the mirror problem.  ensure we set the value if it doesn't
exist in the repo object.  also, default enabled/groupsenabled to 0 in the
repo since we'll override if the config says one.

RepoConf and Repository really do need to be merged...


Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- config.py	14 Dec 2005 19:12:47 -0000	1.84
+++ config.py	14 Dec 2005 21:17:21 -0000	1.85
@@ -502,7 +502,7 @@
     # Transfer attributes across
     #TODO: merge RepoConf and Repository 
     for k, v in conf.iteritems():
-        if v:
+        if v or not hasattr(thisrepo, k):
             thisrepo.set(k, v)
 
     # Set attributes not from the config file

Index: repos.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/repos.py,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- repos.py	14 Dec 2005 19:12:47 -0000	1.88
+++ repos.py	14 Dec 2005 21:17:21 -0000	1.89
@@ -324,8 +324,8 @@
         # some default (ish) things
         self.urls = []
         self.gpgcheck = 0
-        self.enabled = 1
-        self.enablegroups = 1
+        self.enabled = 0
+        self.enablegroups = 0
         self.groupsfilename = 'yumgroups.xml' # something some freaks might 
                                               # eventually want
         self.setkeys = []
@@ -350,13 +350,6 @@
         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 }