Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/
Date: Thu, 29 Sep 2011 16:49:22
Message-Id: a24bcfcfad95fcf4b71064e386fb6272f41ff49a.zmedico@gentoo
1 commit: a24bcfcfad95fcf4b71064e386fb6272f41ff49a
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 29 16:48:55 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 16:48:55 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a24bcfcf
7
8 repoman: never force unsigned manifest commit
9
10 This removes a special case where manifests would first be commited
11 without signatures for category-level or greater commits. This case
12 behavior wasn't very useful anyway, and would be a problem if the
13 unsigned manifests got rejected by a commit hook (as may happen in the
14 near future).
15
16 ---
17 bin/repoman | 33 ---------------------------------
18 1 files changed, 0 insertions(+), 33 deletions(-)
19
20 diff --git a/bin/repoman b/bin/repoman
21 index 184c5ef..20f4b15 100755
22 --- a/bin/repoman
23 +++ b/bin/repoman
24 @@ -2557,39 +2557,6 @@ else:
25 print(red("I'm confused... I don't know where I am!"))
26 sys.exit(1)
27
28 - # Force an unsigned commit when more than one Manifest needs to be signed.
29 - if repolevel < 3 and sign_manifests:
30 -
31 - fd, commitmessagefile = tempfile.mkstemp(".repoman.msg")
32 - mymsg = os.fdopen(fd, "wb")
33 - mymsg.write(_unicode_encode(commitmessage))
34 - mymsg.write(b"\n (Unsigned Manifest commit)")
35 - mymsg.close()
36 -
37 - commit_cmd = [vcs]
38 - commit_cmd.extend(vcs_global_opts)
39 - commit_cmd.append("commit")
40 - commit_cmd.extend(vcs_local_opts)
41 - commit_cmd.extend(["-F", commitmessagefile])
42 - commit_cmd.extend(f.lstrip("./") for f in mymanifests)
43 -
44 - try:
45 - if options.pretend:
46 - print("(%s)" % (" ".join(commit_cmd),))
47 - else:
48 - retval = spawn(commit_cmd, env=os.environ)
49 - if retval:
50 - writemsg_level(("!!! Exiting on %s (shell) " + \
51 - "error code: %s\n") % (vcs, retval),
52 - level=logging.ERROR, noiselevel=-1)
53 - sys.exit(retval)
54 - finally:
55 - try:
56 - os.unlink(commitmessagefile)
57 - except OSError:
58 - pass
59 - manifest_commit_required = False
60 -
61 signed = False
62 if sign_manifests:
63 signed = True