1 |
commit: 0a0670ed7e600d9dbdb2fc77d6f1f5da741f2592 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 18 19:40:48 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 18 19:40:48 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0a0670ed |
7 |
|
8 |
Schduler: _check_temp_dir in _handle_self_update |
9 |
|
10 |
--- |
11 |
pym/_emerge/Scheduler.py | 11 +++++++++-- |
12 |
1 files changed, 9 insertions(+), 2 deletions(-) |
13 |
|
14 |
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py |
15 |
index ad1a944..26c3794 100644 |
16 |
--- a/pym/_emerge/Scheduler.py |
17 |
+++ b/pym/_emerge/Scheduler.py |
18 |
@@ -290,7 +290,7 @@ class Scheduler(PollScheduler): |
19 |
def _handle_self_update(self): |
20 |
|
21 |
if self._opts_no_self_update.intersection(self.myopts): |
22 |
- return |
23 |
+ return os.EX_OK |
24 |
|
25 |
for x in self._mergelist: |
26 |
if not isinstance(x, Package): |
27 |
@@ -307,9 +307,14 @@ class Scheduler(PollScheduler): |
28 |
'9999' in x.cpv or \ |
29 |
'git' in x.inherited or \ |
30 |
'git-2' in x.inherited: |
31 |
+ rval = _check_temp_dir(self.settings) |
32 |
+ if rval != os.EX_OK: |
33 |
+ return rval |
34 |
_prepare_self_update(self.settings) |
35 |
break |
36 |
|
37 |
+ return os.EX_OK |
38 |
+ |
39 |
def _terminate_tasks(self): |
40 |
self._status_display.quiet = True |
41 |
while self._running_tasks: |
42 |
@@ -961,7 +966,9 @@ class Scheduler(PollScheduler): |
43 |
except self._unknown_internal_error: |
44 |
return 1 |
45 |
|
46 |
- self._handle_self_update() |
47 |
+ rval = self._handle_self_update() |
48 |
+ if rval != os.EX_OK: |
49 |
+ return rval |
50 |
|
51 |
for root in self.trees: |
52 |
root_config = self.trees[root]["root_config"] |