[yum-commits] Branch 'yum-3_2_X' - yum/plugins.py

[James Antill]

 yum/plugins.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

    Go back to using optparser for plugins (plugins can still opt in).

diff --git a/yum/plugins.py b/yum/plugins.py
index bac737f..cff1fa1 100644
--- a/yum/plugins.py
+++ b/yum/plugins.py
@@ -410,7 +410,10 @@ class PluginConduit:
         @return: the global optparse.OptionParser instance used by Yum. May be
             None if an OptionParser isn't in use.
         '''
-        return self._parent.optparser.plugin_option_group
+        # ' xemacs highlighting hack
+        # This isn't API compatible :(
+        # return self._parent.optparser.plugin_option_group
+        return self._parent.optparser
 
     def confString(self, section, opt, default=None):
         '''Read a string value from the plugin's own configuration file
@@ -420,6 +423,7 @@ class PluginConduit:
         @param default: Value to read if option is missing.
         @return: String option value read, or default if option was missing.
         '''
+        # ' xemacs highlighting hack
         return config.getOption(self._conf, section, opt, config.Option(default))
 
     def confInt(self, section, opt, default=None):