diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-07 09:50:34 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-07 09:50:34 -0400 |
| commit | dfd79c78df9351c1c4c337f94881bba878c3c549 (patch) | |
| tree | ceb1788d989e01a3795b76119ac0caacd838b1bb | |
| parent | d94a58c5718d6e886ea1a2daff14f3939916be47 (diff) | |
| download | bcfg2-dfd79c78df9351c1c4c337f94881bba878c3c549.tar.gz bcfg2-dfd79c78df9351c1c4c337f94881bba878c3c549.tar.bz2 bcfg2-dfd79c78df9351c1c4c337f94881bba878c3c549.zip | |
disabling metadata implies disabling the resolver
| -rw-r--r-- | doc/server/plugins/generators/packages.txt | 7 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Packages/__init__.py | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/server/plugins/generators/packages.txt b/doc/server/plugins/generators/packages.txt index 1eeab4f8b..41e3925e5 100644 --- a/doc/server/plugins/generators/packages.txt +++ b/doc/server/plugins/generators/packages.txt @@ -137,6 +137,8 @@ All metadata processing can be disabled as well:: [global] metadata=0 +This setting implies disabling the resolver. + Blacklisting faulty dependencies -------------------------------- @@ -654,8 +656,9 @@ It understands the following directives: (true). For historical reasons, this also accepts "enabled" and "disabled". * ``metadata``: Enable metadata processing. Default is ``1`` - (true). For historical reasons, this also accepts "enabled" and - "disabled". + (true). If ``metadata`` is disabled, it's implied that ``resolver`` + is also disabled. For historical reasons, this also accepts + "enabled" and "disabled". * ``yum_config``: The path at which to generate Yum configs. No default. * ``apt_config``: The path at which to generate APT configs. No diff --git a/src/lib/Server/Plugins/Packages/__init__.py b/src/lib/Server/Plugins/Packages/__init__.py index da5832e90..b04c299a6 100644 --- a/src/lib/Server/Plugins/Packages/__init__.py +++ b/src/lib/Server/Plugins/Packages/__init__.py @@ -47,6 +47,10 @@ class Packages(Bcfg2.Server.Plugin.Plugin, @property def disableResolver(self): + if self.disableMetaData: + # disabling metadata without disabling the resolver Breaks + # Things + return True try: return not self.config.getboolean("global", "resolver") except (ConfigParser.NoSectionError, ConfigParser.NoOptionError): |