diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 07:43:47 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 07:43:47 +0000 |
| commit | 1878f4a0e87a105262ea0595d3457b4c7b3b459d (patch) | |
| tree | 7c40b70b6ab71ef7c5ac8eb17c8cc3e6eccc384d /pym/portage | |
| parent | 219f36533851910d060249d935ba6be77a339feb (diff) | |
| download | portage-1878f4a0e87a105262ea0595d3457b4c7b3b459d.tar.gz portage-1878f4a0e87a105262ea0595d3457b4c7b3b459d.tar.bz2 portage-1878f4a0e87a105262ea0595d3457b4c7b3b459d.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. (trunk r12813)
svn path=/main/branches/2.1.6/; revision=13045
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/__init__.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 8cf90c6d5..b6e8068cf 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) @@ -7891,8 +7891,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)) |