| 1 |
commit: 3769fd0b8cfa080197cf154b2742bc2d7895ae15 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 19 04:27:19 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 21 23:42:47 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3769fd0b |
| 7 |
|
| 8 |
repoamn/actions.py: Split out sign_manifest() |
| 9 |
|
| 10 |
pym/repoman/actions.py | 31 ++++++++++++++++++------------- |
| 11 |
1 file changed, 18 insertions(+), 13 deletions(-) |
| 12 |
|
| 13 |
diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py |
| 14 |
index 5b55ff8..4f516da 100644 |
| 15 |
--- a/pym/repoman/actions.py |
| 16 |
+++ b/pym/repoman/actions.py |
| 17 |
@@ -186,19 +186,7 @@ class Actions(object): |
| 18 |
digestgen(mysettings=self.repoman_settings, myportdb=self.repo_settings.portdb) |
| 19 |
|
| 20 |
if self.repo_settings.sign_manifests: |
| 21 |
- try: |
| 22 |
- for x in sorted(vcs_files_to_cps( |
| 23 |
- chain(myupdates, myremoved, mymanifests), |
| 24 |
- self.scanner.repolevel, self.scanner.reposplit, self.scanner.categories)): |
| 25 |
- self.repoman_settings["O"] = os.path.join(self.repo_settings.repodir, x) |
| 26 |
- manifest_path = os.path.join(self.repoman_settings["O"], "Manifest") |
| 27 |
- if not need_signature(manifest_path): |
| 28 |
- continue |
| 29 |
- gpgsign(manifest_path, self.repoman_settings, self.options) |
| 30 |
- except portage.exception.PortageException as e: |
| 31 |
- portage.writemsg("!!! %s\n" % str(e)) |
| 32 |
- portage.writemsg("!!! Disabled FEATURES='sign'\n") |
| 33 |
- self.repo_settings.sign_manifests = False |
| 34 |
+ self.sign_manifests(myupdates, myremoved, mymanifests) |
| 35 |
|
| 36 |
if self.vcs_settings.vcs == 'git': |
| 37 |
# It's not safe to use the git commit -a option since there might |
| 38 |
@@ -821,3 +809,20 @@ class Actions(object): |
| 39 |
modified = True |
| 40 |
if modified: |
| 41 |
portage.util.write_atomic(x, b''.join(mylines), mode='wb') |
| 42 |
+ |
| 43 |
+ |
| 44 |
+ def sign_manifest(self, myupdates, myremoved, mymanifests): |
| 45 |
+ try: |
| 46 |
+ for x in sorted(vcs_files_to_cps( |
| 47 |
+ chain(myupdates, myremoved, mymanifests), |
| 48 |
+ self.scanner.repolevel, self.scanner.reposplit, self.scanner.categories)): |
| 49 |
+ self.repoman_settings["O"] = os.path.join(self.repo_settings.repodir, x) |
| 50 |
+ manifest_path = os.path.join(self.repoman_settings["O"], "Manifest") |
| 51 |
+ if not need_signature(manifest_path): |
| 52 |
+ continue |
| 53 |
+ gpgsign(manifest_path, self.repoman_settings, self.options) |
| 54 |
+ except portage.exception.PortageException as e: |
| 55 |
+ portage.writemsg("!!! %s\n" % str(e)) |
| 56 |
+ portage.writemsg("!!! Disabled FEATURES='sign'\n") |
| 57 |
+ self.repo_settings.sign_manifests = False |
| 58 |
+ |
Archives