From a1091d4b0c538cfabc1f67e7758d7c9bab71a040 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Mon, 9 Feb 2015 11:51:01 -0800 Subject: [PATCH] portage/sync/controller.py: Fix missed self.portdb assignment bug 539478 In _sync_callback() action_metadata() call, portdb was needed as one of it's parameters. But it was not defined when it was moved into task_opts dictionary to be passed to the sync module. --- pym/portage/sync/controller.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/portage/sync/controller.py b/pym/portage/sync/controller.py index 1583767297..6dec3c80bd 100644 --- a/pym/portage/sync/controller.py +++ b/pym/portage/sync/controller.py @@ -135,7 +135,7 @@ def sync(self, emerge_config=None, repo=None, callback=None): task_opts = { 'emerge_config': emerge_config, 'logger': self.logger, - 'portdb': self.trees[self.settings['EROOT']]['porttree'].dbapi, + 'portdb': self.portdb, 'repo': repo, 'settings': self.settings, 'spawn_kwargs': self.spawn_kwargs, @@ -192,6 +192,7 @@ def pre_sync(self, repo): % (repo.name, repo.location) self.logger(self.xterm_titles, msg) writemsg_level(msg + "\n") + self.portdb = self.trees[self.settings['EROOT']]['porttree'].dbapi try: st = os.stat(repo.location) except OSError: