diff options
| -rwxr-xr-x | bin/repoman | 5 | ||||
| -rw-r--r-- | pym/portage/repository/config.py | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/bin/repoman b/bin/repoman index 4966d22c8..bec3b1e01 100755 --- a/bin/repoman +++ b/bin/repoman @@ -637,10 +637,7 @@ if "commit" == options.mode and \ print(prefix + line) sys.exit(1) -if options.echangelog is None and \ - repo_config.name == "gentoo": - # Bug #337853 - gentoo's council says to enable - # --echangelog by default for the "gentoo" repo +if options.echangelog is None and repo_config.update_changelog: options.echangelog = 'y' if vcs is None: diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 12829c33b..fddba6cf4 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -48,7 +48,7 @@ class RepoConfig(object): 'eclass_overrides', 'eclass_locations', 'format', 'location', 'main_repo', 'manifest_hashes', 'masters', 'missing_repo_name', 'name', 'priority', 'sign_manifest', 'sync', 'thin_manifest', - 'user_location') + 'update_changelog', 'user_location') def __init__(self, name, repo_opts): """Build a RepoConfig with options in repo_opts @@ -126,6 +126,7 @@ class RepoConfig(object): self.create_manifest = True self.disable_manifest = False self.manifest_hashes = None + self.update_changelog = False self.cache_format = None def get_pregenerated_cache(self, auxdbkeys, readonly=True, force=False): @@ -431,6 +432,9 @@ class RepoConfigLoader(object): DeprecationWarning) repo.manifest_hashes = manifest_hashes + if layout_data.get('update-changelog', '').lower() == 'true': + repo.update_changelog = True + #Take aliases into account. new_prepos = {} for repo_name, repo in prepos.items(): |