diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-23 14:41:00 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-23 14:41:00 -0500 |
| commit | 01df50ad3db5f1fec41c9e1ef2d7f78184a4abfb (patch) | |
| tree | af0b454fa01ab74b9431f4f01f6a2b4a426f348b /src/lib/Bcfg2/Server/Plugins/Packages/Collection.py | |
| parent | 90735d15295dc1cb4da4084e6f7bd8752107abb6 (diff) | |
| download | bcfg2-01df50ad3db5f1fec41c9e1ef2d7f78184a4abfb.tar.gz bcfg2-01df50ad3db5f1fec41c9e1ef2d7f78184a4abfb.tar.bz2 bcfg2-01df50ad3db5f1fec41c9e1ef2d7f78184a4abfb.zip | |
Packages: fixed bug with display of package entries that have been converted to tuples
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages/Collection.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Collection.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py b/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py index f9bb9e1a2..b25cb0fc4 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py @@ -264,7 +264,7 @@ class Collection(list, Bcfg2.Server.Plugin.Debuggable): support multiple package types in package groups (e.g., "recommended," "optional," etc.) :type ptype: string - :returns: list of strings - package names, but see + :returns: list of strings - package names, but see :ref:`pkg-objects` """ if not self.__package_groups__: @@ -467,7 +467,7 @@ class Collection(list, Bcfg2.Server.Plugin.Debuggable): included in the client configuration. See :ref:`pkg-objects` for more details. - :param pkglist: A list of packages as returned by + :param pkglist: A list of packages as returned by :func:`complete` :type pkglist: list of strings, but see :ref:`pkg-objects` :param entry: The base XML entry to add all of the Package @@ -562,7 +562,7 @@ class Collection(list, Bcfg2.Server.Plugin.Debuggable): # should be resolved current = pkgs.pop() self.debug_log("Packages: handling package requirement %s" % - current) + (current,)) packages.add(current) deps = self.get_deps(current) newdeps = set(deps).difference(examined) |