diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-11-18 11:40:48 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-11-18 11:40:48 -0800 |
| commit | 0a0670ed7e600d9dbdb2fc77d6f1f5da741f2592 (patch) | |
| tree | d9498de028db79bf20336423faa669a730520fd3 | |
| parent | 935694debc955a18a6a93af923f3f98caacf3f74 (diff) | |
| download | portage-0a0670ed7e600d9dbdb2fc77d6f1f5da741f2592.tar.gz portage-0a0670ed7e600d9dbdb2fc77d6f1f5da741f2592.tar.bz2 portage-0a0670ed7e600d9dbdb2fc77d6f1f5da741f2592.zip | |
Schduler: _check_temp_dir in _handle_self_update
| -rw-r--r-- | pym/_emerge/Scheduler.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index ad1a94492..26c3794f0 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -290,7 +290,7 @@ class Scheduler(PollScheduler): def _handle_self_update(self): if self._opts_no_self_update.intersection(self.myopts): - return + return os.EX_OK for x in self._mergelist: if not isinstance(x, Package): @@ -307,9 +307,14 @@ class Scheduler(PollScheduler): '9999' in x.cpv or \ 'git' in x.inherited or \ 'git-2' in x.inherited: + rval = _check_temp_dir(self.settings) + if rval != os.EX_OK: + return rval _prepare_self_update(self.settings) break + return os.EX_OK + def _terminate_tasks(self): self._status_display.quiet = True while self._running_tasks: @@ -961,7 +966,9 @@ class Scheduler(PollScheduler): except self._unknown_internal_error: return 1 - self._handle_self_update() + rval = self._handle_self_update() + if rval != os.EX_OK: + return rval for root in self.trees: root_config = self.trees[root]["root_config"] |