[yum-commits] Branch 'yum-3_2_X' - 3 commits - cli.py yum/__init__.py yum/update_md.py

[James Antill]

 cli.py           |    3 +++
 yum/__init__.py  |    3 +++
 yum/update_md.py |    2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit dbc8c0e852cb9ebfb8ddd825cd28da5f76d20c57
Author: James Antill <james at and.org>
Date:   Tue Nov 9 14:31:03 2010 -0500

    Warn about mis-spelling setopt stuff.

diff --git a/cli.py b/cli.py
index b84183b..b01a1ef 100644
--- a/cli.py
+++ b/cli.py
@@ -230,6 +230,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
             # now set  all the non-first-start opts from main from our setopts
             if self.main_setopts:
                 for opt in self.main_setopts.items:
+                    if not hasattr(self.conf, opt):
+                        msg ="Main config did not have a %s attr. before setopt"
+                        self.logger.warning(msg % opt)
                     setattr(self.conf, opt, getattr(self.main_setopts, opt))
 
         except yum.Errors.ConfigError, e:
diff --git a/yum/__init__.py b/yum/__init__.py
index a588dc8..cfb60b3 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -418,6 +418,9 @@ class YumBase(depsolve.Depsolve):
                 
             if thisrepo.id in self.repo_setopts:
                 for opt in self.repo_setopts[thisrepo.id].items:
+                    if not hasattr(thisrepo, opt):
+                        msg = "Repo %s did not have a %s attr. before setopt"
+                        self.logger.warning(msg % (thisrepo.id, opt))
                     setattr(thisrepo, opt, getattr(self.repo_setopts[thisrepo.id], opt))
                     
             if validate and not validate(thisrepo):
commit 6d305c5466f8d1d042893f25b3c66370b82dcd98
Merge: eb078ed... 8f316cf...
Author: James Antill <james at and.org>
Date:   Tue Nov 9 14:23:58 2010 -0500

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      update man page for clean_requirements_on_remove
      add the functionality of remove_with_leaves to core
      - Make downgrade testcase - fix test DepsolveProgressCallback to handle downgrade - fix skip-broken code to handle downgrades - prefix all skipbroken debug message with 'SKIPBROKEN:' for easier filtering

commit eb078ed40e4ff9ef3cf5e1041c2aa7da143bf2b9
Author: James Antill <james at and.org>
Date:   Fri Nov 5 08:39:40 2010 -0400

    Skip displaying rights into in updateinfo (by default).

diff --git a/yum/update_md.py b/yum/update_md.py
index 56b5307..83e56c6 100644
--- a/yum/update_md.py
+++ b/yum/update_md.py
@@ -75,7 +75,7 @@ class UpdateNotice(object):
     def __setitem__(self, item, val):
         self._md[item] = val
 
-    def text(self, skip_data=('files', 'summary', 'solution')):
+    def text(self, skip_data=('files', 'summary', 'rights', 'solution')):
         head = """
 ===============================================================================
   %(title)s