From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RGw3n-00032h-BW for garchives@archives.gentoo.org; Thu, 20 Oct 2011 17:05:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1C4F21C0D8; Thu, 20 Oct 2011 17:05:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7315121C118 for ; Thu, 20 Oct 2011 17:05:31 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EDF3F1B400C for ; Thu, 20 Oct 2011 17:05:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1F96480042 for ; Thu, 20 Oct 2011 17:05:30 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <7f9e716d4198f90032d91e8e8adfbc6d7673883c.grobian@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/, pym/portage/repository/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman pym/portage/repository/config.py X-VCS-Directories: bin/ pym/portage/repository/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 7f9e716d4198f90032d91e8e8adfbc6d7673883c Date: Thu, 20 Oct 2011 17:05:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: fabb6f7770505729befe77bd0cb0492f commit: 7f9e716d4198f90032d91e8e8adfbc6d7673883c Author: Fabian Groffen gentoo org> AuthorDate: Thu Oct 20 16:58:04 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Oct 20 16:58:04 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7f9e716d 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 =3D true --- bin/repoman | 5 +---- pym/portage/repository/config.py | 6 +++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/repoman b/bin/repoman index 4966d22..bec3b1e 100755 --- a/bin/repoman +++ b/bin/repoman @@ -637,10 +637,7 @@ if "commit" =3D=3D options.mode and \ print(prefix + line) sys.exit(1) =20 -if options.echangelog is None and \ - repo_config.name =3D=3D "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 =3D 'y' =20 if vcs is None: diff --git a/pym/portage/repository/config.py b/pym/portage/repository/co= nfig.py index 12829c3..fddba6c 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') =20 def __init__(self, name, repo_opts): """Build a RepoConfig with options in repo_opts @@ -126,6 +126,7 @@ class RepoConfig(object): self.create_manifest =3D True self.disable_manifest =3D False self.manifest_hashes =3D None + self.update_changelog =3D False self.cache_format =3D None =20 def get_pregenerated_cache(self, auxdbkeys, readonly=3DTrue, force=3DFa= lse): @@ -431,6 +432,9 @@ class RepoConfigLoader(object): DeprecationWarning) repo.manifest_hashes =3D manifest_hashes =20 + if layout_data.get('update-changelog', '').lower() =3D=3D 'true': + repo.update_changelog =3D True + #Take aliases into account. new_prepos =3D {} for repo_name, repo in prepos.items():