Here's a patch Seth and I talked about for how we can easily get rid of
doConfigSetup() etc. when we break the API, without having to do lots of
code changes all over the place at the same time.
The basic idea is that if you want to run yum without plugins, instead
of calling:
yb.doConfigSetup(init_plugins=False)
...you'd just do:
yb.preconf.init_plugins = False
...and then when the yb.conf object is created it'll take the data from
there. It's backwards compatible with the external API, so we can
convert callers and then just rm the methods when we have an API break.
--
James Antill <[EMAIL PROTECTED]>
Fedora
commit 0c34b8e1b39959d1f537e5389dfdca234eb9db09
Author: James Antill <[EMAIL PROTECTED]>
Date: Fri Oct 24 14:47:30 2008 -0400
Add preconf, so we can remove doConfigSetup etc.
diff --git a/cli.py b/cli.py
index ff4c7d6..af97d0e 100644
--- a/cli.py
+++ b/cli.py
@@ -174,14 +174,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
# Read up configuration options and initialise plugins
try:
- self._getConfig(opts.conffile, root,
- init_plugins=not opts.noplugins,
- plugin_types=(yum.plugins.TYPE_CORE, yum.plugins.TYPE_INTERACTIVE),
- optparser=self.optparser,
- debuglevel=opts.debuglevel,
- errorlevel=opts.errorlevel,
- disabled_plugins=self.optparser._splitArg(opts.disableplugins),
- enabled_plugins=self.optparser._splitArg(opts.enableplugins))
+ pc = self.preconf
+ pc.fn = opts.conffile
+ pc.root = root
+ pc.init_plugins = not opts.noplugins
+ pc.plugin_types = (yum.plugins.TYPE_CORE,
+ yum.plugins.TYPE_INTERACTIVE)
+ pc.optparser = self.optparser
+ pc.debuglevel = opts.debuglevel
+ pc.errorlevel = opts.errorlevel
+ pc.disabled_plugins = self.optparser._splitArg(opts.disableplugins)
+ pc.enabled_plugins = self.optparser._splitArg(opts.enableplugins)
+ self.conf
except yum.Errors.ConfigError, e:
self.logger.critical(_('Config Error: %s'), e)
diff --git a/utils.py b/utils.py
index d92f533..9348608 100644
--- a/utils.py
+++ b/utils.py
@@ -61,12 +61,16 @@ class YumUtilBase(YumBaseCli):
root = self._parser.getRoot(opts)
# Read up configuration options and initialise plugins
try:
- self._getConfig(opts.conffile, root,
- init_plugins=not opts.noplugins,
- plugin_types= pluginsTypes,
- optparser=self._parser,
- debuglevel=opts.debuglevel,
- errorlevel=opts.errorlevel)
+ pc = self.preconf
+ pc.fn = opts.conffile
+ pc.root = root
+ pc.init_plugins = not opts.noplugins
+ pc.plugin_types = pluginsTypes
+ pc.optparser = self._parser
+ pc.debuglevel = opts.debuglevel
+ pc.errorlevel = opts.errorlevel
+ self.conf
+
except yum.Errors.ConfigError, e:
self.logger.critical(_('Config Error: %s'), e)
sys.exit(1)
diff --git a/yum/__init__.py b/yum/__init__.py
index 7aafb84..54e2808 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -82,6 +82,23 @@ __version_info__ = tuple([ int(num) for num in __version__.split('.')])
# multiple YumBase() objects.
default_grabber.opts.user_agent += " yum/" + __version__
+class _YumPreBaseConf:
+ """This is the configuration interface for the YumBase configuration.
+ So if you want to change if plugins are on/off, or debuglevel/etc.
+ you tweak it here, and when yb.conf does it's thing ... it happens. """
+
+ def __init__(self):
+ self.fn = '/etc/yum/yum.conf'
+ self.root = '/'
+ self.init_plugins = True
+ self.plugin_types = (plugins.TYPE_CORE,)
+ self.optparser = None
+ self.debuglevel = None
+ self.errorlevel = None
+ self.disabled_plugins = None
+ self.enabled_plugins = None
+
+
class YumBase(depsolve.Depsolve):
"""This is a primary structure and base class. It houses the objects and
methods needed to perform most things in yum. It is almost an abstract
@@ -108,6 +125,8 @@ class YumBase(depsolve.Depsolve):
self.mediagrabber = None
+ self.preconf = _YumPreBaseConf()
+
def __del__(self):
self.close()
self.closeRpmDB()
@@ -124,8 +143,8 @@ class YumBase(depsolve.Depsolve):
def doGenericSetup(self, cache=0):
"""do a default setup for all the normal/necessary yum components,
really just a shorthand for testing"""
-
- self._getConfig(init_plugins=False)
+
+ self.preconf.init_plugins = False
self.conf.cache = cache
def doConfigSetup(self, fn='/etc/yum/yum.conf', root='/', init_plugins=True,
@@ -134,37 +153,42 @@ class YumBase(depsolve.Depsolve):
warnings.warn(_('doConfigSetup() will go away in a future version of Yum.\n'),
Errors.YumFutureDeprecationWarning, stacklevel=2)
- return self._getConfig(fn=fn, root=root, init_plugins=init_plugins,
- plugin_types=plugin_types, optparser=optparser, debuglevel=debuglevel,
- errorlevel=errorlevel)
+ self.preconf.fn = fn
+ self.preconf.root = root
+ self.preconf.init_plugins = init_plugins
+ self.preconf.plugin_types = plugin_types
+ self.preconf.optparser = optparser
+ self.preconf.debuglevel = debuglevel
+ self.preconf.errorlevel = errorlevel
+
+ return self.conf
- def _getConfig(self, fn='/etc/yum/yum.conf', root='/', init_plugins=True,
- plugin_types=(plugins.TYPE_CORE,), optparser=None, debuglevel=None,
- errorlevel=None,disabled_plugins=None,enabled_plugins=None):
+ def _getConfig(self):
'''
Parse and load Yum's configuration files and call hooks initialise
- plugins and logging.
-
- @param fn: Path to main configuration file to parse (yum.conf).
- @param root: Filesystem root to use.
- @param init_plugins: If False, plugins will not be loaded here. If
- True, plugins will be loaded if the "plugins" option is enabled in
- the configuration file.
- @param plugin_types: As per doPluginSetup()
- @param optparser: As per doPluginSetup()
- @param debuglevel: Debug level to use for logging. If None, the debug
- level will be read from the configuration file.
- @param errorlevel: Error level to use for logging. If None, the debug
- level will be read from the configuration file.
- @param disabled_plugins: Plugins to be disabled
- @param enabled_plugins: Plugins to be enabled
- '''
+ plugins and logging. Uses self.preconf for pre-configuration,
+ configuration. '''
# ' xemacs syntax hack
if self._conf:
return self._conf
conf_st = time.time()
+
+ fn = self.preconf.fn
+ root = self.preconf.root
+ init_plugins = self.preconf.init_plugins
+ plugin_types = self.preconf.plugin_types
+ optparser = self.preconf.optparser
+ debuglevel = self.preconf.debuglevel
+ errorlevel = self.preconf.errorlevel
+ disabled_plugins = self.preconf.disabled_plugins
+ enabled_plugins = self.preconf.enabled_plugins
+
+ # We don't want people accessing/altering preconf after it becomes
+ # worthless. So we delete it, and thus. it'll raise AttributeError
+ del self.preconf
+
# TODO: Remove this block when we no longer support configs outside
# of /etc/yum/
if fn == '/etc/yum/yum.conf' and not os.path.exists(fn):
@@ -391,7 +415,7 @@ class YumBase(depsolve.Depsolve):
def _getRepos(self, thisrepo=None, doSetup = False):
""" For each enabled repository set up the basics of the repository. """
- self._getConfig() # touch the config class first
+ self.conf # touch the config class first
if doSetup:
repo_st = time.time()
_______________________________________________
Yum-devel mailing list
Yum-devel@lists.baseurl.org
http://lists.baseurl.org/mailman/listinfo/yum-devel
