diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 13:34:23 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 13:34:23 -0500 |
| commit | 407e6e9240a705d0fbcf6fdad6b76ad8168c4a1a (patch) | |
| tree | 341a842ee5aa6723029816f706434ca4c748be9a /src/lib/Bcfg2/Server/Plugins/Packages/Source.py | |
| parent | ee2a04a2df209be96ad1e3b5ff68e6c875bcbaa7 (diff) | |
| parent | 661d1f6d2789e855eff4fca38e6f4a0a564da728 (diff) | |
| download | bcfg2-407e6e9240a705d0fbcf6fdad6b76ad8168c4a1a.tar.gz bcfg2-407e6e9240a705d0fbcf6fdad6b76ad8168c4a1a.tar.bz2 bcfg2-407e6e9240a705d0fbcf6fdad6b76ad8168c4a1a.zip | |
Merge branch '1.3.1' into 1.4.x
Conflicts:
src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages/Source.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Source.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py index 9aa88e7b0..7a8b2827a 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py @@ -50,6 +50,7 @@ import os import re import sys import Bcfg2.Server.Plugin +from Bcfg2.Options import get_option_parser from Bcfg2.Compat import HTTPError, HTTPBasicAuthHandler, \ HTTPPasswordMgrWithDefaultRealm, install_opener, build_opener, \ urlopen, cPickle, md5 @@ -110,15 +111,13 @@ class Source(Bcfg2.Server.Plugin.Debuggable): # pylint: disable=R0902 #: when they are handled by :mod:`Bcfg2.Server.Plugins.Packages`. ptype = None - def __init__(self, basepath, xsource, setup): # pylint: disable=R0912 + def __init__(self, basepath, xsource): # pylint: disable=R0912 """ :param basepath: The base filesystem path under which cache data for this source should be stored :type basepath: string :param xsource: The XML tag that describes this source :type source: lxml.etree._Element - :param setup: A Bcfg2 options dict - :type setup: dict :raises: :class:`Bcfg2.Server.Plugins.Packages.Source.SourceInitError` """ Bcfg2.Server.Plugin.Debuggable.__init__(self) @@ -131,7 +130,7 @@ class Source(Bcfg2.Server.Plugin.Debuggable): # pylint: disable=R0902 self.xsource = xsource #: A Bcfg2 options dict - self.setup = setup + self.setup = get_option_parser() #: A set of package names that are deemed "essential" by this #: source |