repoman: get default to update changelog from layout.conf
Updating the ChangeLog file may be desirable in more repos than just the
one named 'gentoo', like e.g. the Prefix one. Hence, make this default configurable though metadata/layout.conf. This commit must go accompanied by a commit to gentoo-x86/metadata/layout.conf that adds the following bit: # Bug #337853 - gentoo's council says to enable # --echangelog by default for the "gentoo" repo update-changelog = true diff --git a/bin/repoman b/bin/repoman --- a/bin/repoman +++ b/bin/repoman @@ -644,10 +644,7 @@ 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 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -48,7 +48,7 @@ '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 @@ 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 @@ 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(): |
| All times are GMT. The time now is 04:58 PM. |
VBulletin, Copyright ©2000 - 2013, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.