summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-10 00:55:22 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-10 00:55:22 +0000
commit4973347b56a01358ac77a4600a25dbd4a7838ea1 (patch)
tree5aae1f13422b74e412f85579072848144fae827c
parentcf7a49b2fb63269eda0e25f20ee323e1ade6b8f5 (diff)
downloadportage-4973347b56a01358ac77a4600a25dbd4a7838ea1.tar.gz
portage-4973347b56a01358ac77a4600a25dbd4a7838ea1.tar.bz2
portage-4973347b56a01358ac77a4600a25dbd4a7838ea1.zip
When the config_incrementals parameter is unspecified in the config
constructor, don't warn because it's ridiculous to require this parameter when it's always the same anyway. svn path=/main/trunk/; revision=12813
-rw-r--r--pym/portage/__init__.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 664d95286..53ae54048 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1126,7 +1126,8 @@ class config(object):
@type mycpv: String
@param config_profile_path: Configurable path to the profile (usually PROFILE_PATH from portage.const)
@type config_profile_path: String
- @param config_incrementals: List of incremental variables (usually portage.const.INCREMENTALS)
+ @param config_incrementals: List of incremental variables
+ (defaults to portage.const.INCREMENTALS)
@type config_incrementals: List
@param config_root: path to read local config from (defaults to "/", see PORTAGE_CONFIGROOT)
@type config_root: String
@@ -1261,8 +1262,7 @@ class config(object):
else:
self.profile_path = config_profile_path[:]
- if not config_incrementals:
- writemsg("incrementals not specified to class config\n")
+ if config_incrementals is None:
self.incrementals = copy.deepcopy(portage.const.INCREMENTALS)
else:
self.incrementals = copy.deepcopy(config_incrementals)
@@ -7904,8 +7904,7 @@ def create_trees(config_root=None, target_root=None, trees=None):
# When ROOT != "/" we only want overrides from the calling
# environment to apply to the config that's associated
# with ROOT != "/", so pass an empty dict for the env parameter.
- settings = config(config_root=None, target_root="/", env={},
- config_incrementals=portage.const.INCREMENTALS)
+ settings = config(config_root=None, target_root="/", env={})
settings.lock()
myroots.append((settings["ROOT"], settings))