| 1 |
commit: a1091d4b0c538cfabc1f67e7758d7c9bab71a040 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 9 19:51:01 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 9 20:11:44 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a1091d4b |
| 7 |
|
| 8 |
portage/sync/controller.py: Fix missed self.portdb assignment bug 539478 |
| 9 |
|
| 10 |
In _sync_callback() action_metadata() call, portdb was needed as one of it's parameters. |
| 11 |
But it was not defined when it was moved into task_opts dictionary to be passed to the sync module. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/portage/sync/controller.py | 3 ++- |
| 15 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/pym/portage/sync/controller.py b/pym/portage/sync/controller.py |
| 18 |
index 1583767..6dec3c8 100644 |
| 19 |
--- a/pym/portage/sync/controller.py |
| 20 |
+++ b/pym/portage/sync/controller.py |
| 21 |
@@ -135,7 +135,7 @@ class SyncManager(object): |
| 22 |
task_opts = { |
| 23 |
'emerge_config': emerge_config, |
| 24 |
'logger': self.logger, |
| 25 |
- 'portdb': self.trees[self.settings['EROOT']]['porttree'].dbapi, |
| 26 |
+ 'portdb': self.portdb, |
| 27 |
'repo': repo, |
| 28 |
'settings': self.settings, |
| 29 |
'spawn_kwargs': self.spawn_kwargs, |
| 30 |
@@ -192,6 +192,7 @@ class SyncManager(object): |
| 31 |
% (repo.name, repo.location) |
| 32 |
self.logger(self.xterm_titles, msg) |
| 33 |
writemsg_level(msg + "\n") |
| 34 |
+ self.portdb = self.trees[self.settings['EROOT']]['porttree'].dbapi |
| 35 |
try: |
| 36 |
st = os.stat(repo.location) |
| 37 |
except OSError: |
Archives