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: Wed, 06 Jun 2012 01:36:04
Message-Id: 1338946535.9dbf4d7d7fb7c6d0284cc25d8322dd84292d6dd9.zmedico@gentoo
1 commit: 9dbf4d7d7fb7c6d0284cc25d8322dd84292d6dd9
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 6 01:35:35 2012 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 6 01:35:35 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9dbf4d7d
7
8 repoman: try to sign Manifest only if it exists
9
10 This case occurs with "thin-manifests = true" in metadata/layout.conf
11 when there are no distfiles (like for live ebuilds), as reported in
12 bug #419717.
13
14 ---
15 bin/repoman | 5 ++++-
16 1 files changed, 4 insertions(+), 1 deletions(-)
17
18 diff --git a/bin/repoman b/bin/repoman
19 index e43fa1c..65ba459 100755
20 --- a/bin/repoman
21 +++ b/bin/repoman
22 @@ -2751,7 +2751,10 @@ else:
23 for x in sorted(vcs_files_to_cps(
24 chain(myupdates, myremoved, mymanifests))):
25 repoman_settings["O"] = os.path.join(repodir, x)
26 - gpgsign(os.path.join(repoman_settings["O"], "Manifest"))
27 + manifest_path = os.path.join(repoman_settings["O"], "Manifest")
28 + if not os.path.exists(manifest_path):
29 + continue
30 + gpgsign(manifest_path)
31 except portage.exception.PortageException as e:
32 portage.writemsg("!!! %s\n" % str(e))
33 portage.writemsg("!!! Disabled FEATURES='sign'\n")