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 1ReuJx-0004nP-Oh for garchives@archives.gentoo.org; Sun, 25 Dec 2011 20:05:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD53521C095; Sun, 25 Dec 2011 20:05:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 806AB21C095 for ; Sun, 25 Dec 2011 20:05:18 +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 09AC41B400D for ; Sun, 25 Dec 2011 20:05:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7ADFB80043 for ; Sun, 25 Dec 2011 20:05: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: <656562dd40ea1487dd93a565f8f2f87040555b42.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: 656562dd40ea1487dd93a565f8f2f87040555b42 Date: Sun, 25 Dec 2011 20:05: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: 41f596c8-2d1f-4c3d-b771-362be09f0a3a X-Archives-Hash: 82de4c3ae931ce3d8a4a8ffcd4601aaf commit: 656562dd40ea1487dd93a565f8f2f87040555b42 Author: Zac Medico gentoo org> AuthorDate: Sun Dec 25 20:05:08 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Dec 25 20:05:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D656562dd repoman: later --ask prompt for bug #395995 --- bin/repoman | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/repoman b/bin/repoman index 5924ba9..5fc2de0 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2443,10 +2443,6 @@ else: commitmessage +=3D ", RepoMan options: --force" commitmessage +=3D ")" =20 - if options.ask and userquery('Commit changes?', True) !=3D 'Yes': - print("* aborting commit.") - sys.exit(1) - if options.echangelog in ('y', 'force'): logging.info("checking for unmodified ChangeLog files") committer_name =3D utilities.get_committer_name(env=3Drepoman_settings= ) @@ -2570,6 +2566,10 @@ else: logging.info("myupdates: %s", myupdates) logging.info("myheaders: %s", myheaders) =20 + if options.ask and userquery('Commit changes?', True) !=3D 'Yes': + print("* aborting commit.") + sys.exit(1) + # Handle the case where committed files have keywords which # will change and need a priming commit before the Manifest # can be committed.