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 <gentoo-commits+bounces-388181-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1R9JnV-0001vz-Uw
for garchives@archives.gentoo.org; Thu, 29 Sep 2011 16:49:22 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8023021C0CE;
Thu, 29 Sep 2011 16:49:14 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 55A8E21C0CE
for <gentoo-commits@lists.gentoo.org>; Thu, 29 Sep 2011 16:49:14 +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 B89001B4025
for <gentoo-commits@lists.gentoo.org>; Thu, 29 Sep 2011 16:49:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id C54D780042
for <gentoo-commits@lists.gentoo.org>; Thu, 29 Sep 2011 16:49:12 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <a24bcfcfad95fcf4b71064e386fb6272f41ff49a.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: a24bcfcfad95fcf4b71064e386fb6272f41ff49a
Date: Thu, 29 Sep 2011 16:49:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: d876c74b52ecc3b22309ca4cb6c31e61
commit: a24bcfcfad95fcf4b71064e386fb6272f41ff49a
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 16:48:55 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 16:48:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Da24bcfcf
repoman: never force unsigned manifest commit
This removes a special case where manifests would first be commited
without signatures for category-level or greater commits. This case
behavior wasn't very useful anyway, and would be a problem if the
unsigned manifests got rejected by a commit hook (as may happen in the
near future).
---
bin/repoman | 33 ---------------------------------
1 files changed, 0 insertions(+), 33 deletions(-)
diff --git a/bin/repoman b/bin/repoman
index 184c5ef..20f4b15 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2557,39 +2557,6 @@ else:
print(red("I'm confused... I don't know where I am!"))
sys.exit(1)
=20
- # Force an unsigned commit when more than one Manifest needs to be sig=
ned.
- if repolevel < 3 and sign_manifests:
-
- fd, commitmessagefile =3D tempfile.mkstemp(".repoman.msg")
- mymsg =3D os.fdopen(fd, "wb")
- mymsg.write(_unicode_encode(commitmessage))
- mymsg.write(b"\n (Unsigned Manifest commit)")
- mymsg.close()
-
- commit_cmd =3D [vcs]
- commit_cmd.extend(vcs_global_opts)
- commit_cmd.append("commit")
- commit_cmd.extend(vcs_local_opts)
- commit_cmd.extend(["-F", commitmessagefile])
- commit_cmd.extend(f.lstrip("./") for f in mymanifests)
-
- try:
- if options.pretend:
- print("(%s)" % (" ".join(commit_cmd),))
- else:
- retval =3D spawn(commit_cmd, env=3Dos.environ)
- if retval:
- writemsg_level(("!!! Exiting on %s (shell) " + \
- "error code: %s\n") % (vcs, retval),
- level=3Dlogging.ERROR, noiselevel=3D-1)
- sys.exit(retval)
- finally:
- try:
- os.unlink(commitmessagefile)
- except OSError:
- pass
- manifest_commit_required =3D False
-
signed =3D False
if sign_manifests:
signed =3D True