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 1RCBUP-0000AJ-4i for garchives@archives.gentoo.org; Fri, 07 Oct 2011 14:33:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2114021C05E; Fri, 7 Oct 2011 14:33:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DF44421C05E for ; Fri, 7 Oct 2011 14:33:18 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 618561B4044 for ; Fri, 7 Oct 2011 14:33:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A5C4B80042 for ; Fri, 7 Oct 2011 14:33:17 +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: <1cdf41d1b5c17ac593f0d61a90b8d2a7db6b494d.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 1cdf41d1b5c17ac593f0d61a90b8d2a7db6b494d Date: Fri, 7 Oct 2011 14:33:17 +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: 27c4abf53239e8a56937934745674b2e commit: 1cdf41d1b5c17ac593f0d61a90b8d2a7db6b494d Author: Nathan Phillip Brink gentoo org> AuthorDate: Fri Oct 7 05:00:46 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Oct 7 14:28:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D1cdf41d1 Don't do a split signed Manifest commit when no headers will change. Fixe= s bug #340475. --- bin/repoman | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bin/repoman b/bin/repoman index 7943f54..6b6a197 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2435,10 +2435,11 @@ else: print("* aborting commit.") sys.exit(1) =20 - if vcs in ('cvs', 'svn') and (myupdates or myremoved): + # Handle the case where committed files have keywords which + # will change and need a priming commit before the Manifest + # can be committed. + if (myupdates or myremoved) and myheaders: myfiles =3D myupdates + myremoved - if not myheaders and not sign_manifests: - myfiles +=3D mymanifests fd, commitmessagefile =3D tempfile.mkstemp(".repoman.msg") mymsg =3D os.fdopen(fd, "wb") mymsg.write(_unicode_encode(commitmessage)) @@ -2539,7 +2540,6 @@ else: portage.util.write_atomic(x, b''.join(mylines), mode=3D'wb') =20 - manifest_commit_required =3D True if vcs in ('cvs', 'svn') and (myupdates or myremoved): myfiles =3D myupdates + myremoved for x in range(len(myfiles)-1, -1, -1): @@ -2647,10 +2647,13 @@ else: level=3Dlogging.ERROR, noiselevel=3D-1) sys.exit(retval) =20 - if vcs in ['git', 'bzr', 'hg'] or manifest_commit_required or signed: + if True: =20 myfiles =3D mymanifests[:] - if vcs in ['git', 'bzr', 'hg']: + # If there are no header (SVN/CVS keywords) changes in + # the files, this Manifest commit must include the + # other (yet uncommitted) files. + if not myheaders: myfiles +=3D myupdates myfiles +=3D myremoved myfiles.sort()