[yum-commits] plugins/security plugins/verify

[James Antill]

 plugins/security/security.py |    8 +++-----
 plugins/verify/verify.py     |    3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit a62807dc73fba741ab7435c5c8b653ee252dbbb6
Author: James Antill <james at and.org>
Date:   Tue Mar 31 11:48:29 2009 -0400

    Fix plugins to use plugin_option_group which use parser.values

diff --git a/plugins/security/security.py b/plugins/security/security.py
index 5162e4b..804d192 100755
--- a/plugins/security/security.py
+++ b/plugins/security/security.py
@@ -393,14 +393,12 @@ def config_hook(conduit):
     if not parser:
         return
 
+    if hasattr(parser, 'plugin_option_group'):
+        parser = parser.plugin_option_group
+
     conduit.registerCommand(SecurityListCommand())
     conduit.registerCommand(SecurityInfoCommand())
     conduit.registerCommand(SecurityUpdateCommand())
-    parser.values.advisory = []
-    parser.values.cve      = []
-    parser.values.bz       = []
-    parser.values.security = False
-    parser.values.bugfixes = False
     def osec(opt, key, val, parser):
          # CVE is a subset of --security on RHEL, but not on Fedora
         parser.values.security = True
diff --git a/plugins/verify/verify.py b/plugins/verify/verify.py
index 23b197c..da2ce0b 100644
--- a/plugins/verify/verify.py
+++ b/plugins/verify/verify.py
@@ -432,7 +432,8 @@ def config_hook(conduit):
             getattr(parser.values, 'verify_' + attrs).extend(vals)
         return func
 
-    parser.values.verify_files = []
+    if hasattr(parser, 'plugin_option_group'):
+        parser = parser.plugin_option_group
     parser.add_option('--verify-filenames', action="callback",
                       callback=make_nopt('filenames'), default=[],type="string",
                       help='Only verify files matching this')