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 1RFeio-0000bY-9Q for garchives@archives.gentoo.org; Mon, 17 Oct 2011 04:22:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2340821C024; Mon, 17 Oct 2011 04:22:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D10E621C024 for ; Mon, 17 Oct 2011 04:22:32 +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 526011B4002 for ; Mon, 17 Oct 2011 04:22:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8375A80042 for ; Mon, 17 Oct 2011 04:22:31 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <17a76f21f811e7e5741fa259ef5a635fddfdb75a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/, bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman man/repoman.1 X-VCS-Directories: man/ bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 17a76f21f811e7e5741fa259ef5a635fddfdb75a Date: Mon, 17 Oct 2011 04:22:31 +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: 06c06f8bb07c7b348ea863843972ac6a commit: 17a76f21f811e7e5741fa259ef5a635fddfdb75a Author: Zac Medico gentoo org> AuthorDate: Mon Oct 17 04:22:18 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Oct 17 04:22:18 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D17a76f21 repoman: support --echangelog=3Dforce Allows forced ChangeLog generation even when the vcs has detected that the ChangeLog has already been modified. --- bin/repoman | 11 ++++++----- man/repoman.1 | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bin/repoman b/bin/repoman index ba810c6..ad1e688 100755 --- a/bin/repoman +++ b/bin/repoman @@ -195,8 +195,9 @@ def ParseArgs(argv, qahelp): help=3D'do not print unnecessary messages') =20 parser.add_option( - '--echangelog', type=3D'choice', choices=3D('y', 'n'), metavar=3D"", - help=3D'for commit mode, call echangelog if ChangeLog is unmodified') + '--echangelog', type=3D'choice', choices=3D('y', 'n', 'force'), metava= r=3D"", + help=3D'for commit mode, call echangelog if ChangeLog is unmodified (o= r ' + 'regardless of modification if \'force\' is specified)') =20 parser.add_option('-f', '--force', dest=3D'force', default=3DFalse, act= ion=3D'store_true', help=3D'Commit with QA violations') @@ -654,7 +655,7 @@ if vcs is None: # This is needed because they try to avoid merge collisions. # Gentoo's Council decided to always use the ChangeLog file. # TODO: shouldn't this just be switched on the repo, iso the VCS? -check_changelog =3D options.echangelog !=3D 'y' and vcs in ('cvs', 'svn'= ) +check_changelog =3D options.echangelog not in ('y', 'force') and vcs in = ('cvs', 'svn') =20 # Generate an appropriate PORTDIR_OVERLAY value for passing into the # profile-specific config constructor calls. @@ -2419,7 +2420,7 @@ else: print("* aborting commit.") sys.exit(1) =20 - if options.echangelog =3D=3D 'y': + if options.echangelog in ('y', 'force'): logging.info("checking for unmodified ChangeLog files") for x in sorted(vcs_files_to_cps( chain(myupdates, mymanifests, myremoved))): @@ -2434,7 +2435,7 @@ else: =20 changelog_path =3D os.path.join(checkdir_relative, "ChangeLog") changelog_modified =3D changelog_path in modified_changelogs - if changelog_modified: + if changelog_modified and options.echangelog !=3D 'force': continue =20 # get changes for this package diff --git a/man/repoman.1 b/man/repoman.1 index 4d22e8d..2e4c86c 100644 --- a/man/repoman.1 +++ b/man/repoman.1 @@ -41,8 +41,9 @@ Forces the metadata.xml parse check to be carried out \fB-v\fR, \fB--verbose\fR Displays every package name while checking .TP -\fB\-\-echangelog=3D\fR -For commit mode, call echangelog if ChangeLog is unmodified +\fB\-\-echangelog=3D\fR +For commit mode, call echangelog if ChangeLog is unmodified (or +regardless of modification if 'force' is specified) .TP \fB\-\-if\-modified=3D\fR Only check packages that have uncommitted modifications