1 |
commit: 84e8783a421238e9982e28800c7b71b4892515e1 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 26 08:18:12 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 26 08:18:12 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=84e8783a |
7 |
|
8 |
MergeProcess: relocate portage reinstall code |
9 |
|
10 |
This code goes inside _start since it needs to execute in the parent |
11 |
process. |
12 |
|
13 |
--- |
14 |
pym/portage/dbapi/_MergeProcess.py | 67 +++++++++++++++++++++++++++++++++++- |
15 |
pym/portage/dbapi/vartree.py | 61 +-------------------------------- |
16 |
2 files changed, 67 insertions(+), 61 deletions(-) |
17 |
|
18 |
diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py |
19 |
index 10d8873..43111cb 100644 |
20 |
--- a/pym/portage/dbapi/_MergeProcess.py |
21 |
+++ b/pym/portage/dbapi/_MergeProcess.py |
22 |
@@ -1,14 +1,20 @@ |
23 |
# Copyright 2010-2011 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
+import shutil |
27 |
import signal |
28 |
+import tempfile |
29 |
import traceback |
30 |
|
31 |
import errno |
32 |
import fcntl |
33 |
import portage |
34 |
from portage import os, StringIO, _unicode_decode |
35 |
+from portage.const import PORTAGE_PACKAGE_ATOM |
36 |
+from portage.dep import match_from_list |
37 |
import portage.elog.messages |
38 |
+from portage.elog import _preload_elog_modules |
39 |
+from portage.util import ensure_dirs |
40 |
from _emerge.PollConstants import PollConstants |
41 |
from _emerge.SpawnProcess import SpawnProcess |
42 |
|
43 |
@@ -23,6 +29,60 @@ class MergeProcess(SpawnProcess): |
44 |
'mydbapi', 'prev_mtimes', '_elog_reader_fd', '_elog_reg_id', |
45 |
'_buf', '_elog_keys') |
46 |
|
47 |
+ def _start(self): |
48 |
+ self._handle_self_reinstall() |
49 |
+ super(MergeProcess, self)._start() |
50 |
+ |
51 |
+ def _handle_self_reinstall(self): |
52 |
+ """ |
53 |
+ If portage is reinstalling itself, create temporary |
54 |
+ copies of PORTAGE_BIN_PATH and PORTAGE_PYM_PATH in order |
55 |
+ to avoid relying on the new versions which may be |
56 |
+ incompatible. Register an atexit hook to clean up the |
57 |
+ temporary directories. Pre-load elog modules here since |
58 |
+ we won't be able to later if they get unmerged (happens |
59 |
+ when namespace changes). |
60 |
+ """ |
61 |
+ |
62 |
+ settings = self.settings |
63 |
+ cpv = settings.mycpv |
64 |
+ reinstall_self = False |
65 |
+ if self.settings["ROOT"] == "/" and \ |
66 |
+ match_from_list(PORTAGE_PACKAGE_ATOM, [cpv]): |
67 |
+ inherited = frozenset(self.settings.get('INHERITED', '').split()) |
68 |
+ if not self.vartree.dbapi.cpv_exists(cpv) or \ |
69 |
+ '9999' in cpv or \ |
70 |
+ 'git' in inherited or \ |
71 |
+ 'git-2' in inherited: |
72 |
+ reinstall_self = True |
73 |
+ |
74 |
+ if reinstall_self: |
75 |
+ # Load lazily referenced portage submodules into memory, |
76 |
+ # so imports won't fail during portage upgrade/downgrade. |
77 |
+ _preload_elog_modules(self.settings) |
78 |
+ portage.proxy.lazyimport._preload_portage_submodules() |
79 |
+ |
80 |
+ # Make the temp directory inside $PORTAGE_TMPDIR/portage, since |
81 |
+ # it's common for /tmp and /var/tmp to be mounted with the |
82 |
+ # "noexec" option (see bug #346899). |
83 |
+ build_prefix = os.path.join(settings["PORTAGE_TMPDIR"], "portage") |
84 |
+ ensure_dirs(build_prefix) |
85 |
+ base_path_tmp = tempfile.mkdtemp( |
86 |
+ "", "._portage_reinstall_.", build_prefix) |
87 |
+ portage.process.atexit_register(shutil.rmtree, base_path_tmp) |
88 |
+ dir_perms = 0o755 |
89 |
+ for subdir in "bin", "pym": |
90 |
+ var_name = "PORTAGE_%s_PATH" % subdir.upper() |
91 |
+ var_orig = settings[var_name] |
92 |
+ var_new = os.path.join(base_path_tmp, subdir) |
93 |
+ settings[var_name] = var_new |
94 |
+ settings.backup_changes(var_name) |
95 |
+ shutil.copytree(var_orig, var_new, symlinks=True) |
96 |
+ os.chmod(var_new, dir_perms) |
97 |
+ portage._bin_path = settings['PORTAGE_BIN_PATH'] |
98 |
+ portage._pym_path = settings['PORTAGE_PYM_PATH'] |
99 |
+ os.chmod(base_path_tmp, dir_perms) |
100 |
+ |
101 |
def _elog_output_handler(self, fd, event): |
102 |
output = None |
103 |
if event & PollConstants.POLLIN: |
104 |
@@ -51,7 +111,6 @@ class MergeProcess(SpawnProcess): |
105 |
dblink.merge(). |
106 |
""" |
107 |
|
108 |
- files = self._files |
109 |
elog_reader_fd, elog_writer_fd = os.pipe() |
110 |
fcntl.fcntl(elog_reader_fd, fcntl.F_SETFL, |
111 |
fcntl.fcntl(elog_reader_fd, fcntl.F_GETFL) | os.O_NONBLOCK) |
112 |
@@ -69,7 +128,13 @@ class MergeProcess(SpawnProcess): |
113 |
self._elog_reader_fd = elog_reader_fd |
114 |
self._buf = "" |
115 |
self._elog_keys = set() |
116 |
+ |
117 |
+ # invalidate relevant vardbapi caches |
118 |
+ if self.vartree.dbapi._categories is not None: |
119 |
+ self.vartree.dbapi._categories = None |
120 |
self.vartree.dbapi._pkgs_changed = True |
121 |
+ self.vartree.dbapi._clear_pkg_cache(mylink) |
122 |
+ |
123 |
portage.process.spawned_pids.append(pid) |
124 |
return [pid] |
125 |
|
126 |
|
127 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
128 |
index 98f578f..f8ce331 100644 |
129 |
--- a/pym/portage/dbapi/vartree.py |
130 |
+++ b/pym/portage/dbapi/vartree.py |
131 |
@@ -14,7 +14,7 @@ portage.proxy.lazyimport.lazyimport(globals(), |
132 |
'portage.dep:dep_getkey,isjustname,match_from_list,' + \ |
133 |
'use_reduce,_slot_re', |
134 |
'portage.elog:collect_ebuild_messages,collect_messages,' + \ |
135 |
- 'elog_process,_merge_logentries,_preload_elog_modules', |
136 |
+ 'elog_process,_merge_logentries', |
137 |
'portage.locks:lockdir,unlockdir', |
138 |
'portage.output:bold,colorize', |
139 |
'portage.package.ebuild.doebuild:doebuild_environment,' + \ |
140 |
@@ -3826,65 +3826,6 @@ class dblink(object): |
141 |
def merge(self, mergeroot, inforoot, myroot=None, myebuild=None, cleanup=0, |
142 |
mydbapi=None, prev_mtimes=None): |
143 |
""" |
144 |
- If portage is reinstalling itself, create temporary |
145 |
- copies of PORTAGE_BIN_PATH and PORTAGE_PYM_PATH in order |
146 |
- to avoid relying on the new versions which may be |
147 |
- incompatible. Register an atexit hook to clean up the |
148 |
- temporary directories. Pre-load elog modules here since |
149 |
- we won't be able to later if they get unmerged (happens |
150 |
- when namespace changes). |
151 |
- |
152 |
- @param myroot: ignored, self._eroot is used instead |
153 |
- """ |
154 |
- myroot = None |
155 |
- if self.vartree.dbapi._categories is not None: |
156 |
- self.vartree.dbapi._categories = None |
157 |
- reinstall_self = False |
158 |
- if self.myroot == "/" and \ |
159 |
- match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]): |
160 |
- inherited = frozenset(self.settings.get('INHERITED', '').split()) |
161 |
- if not self.vartree.dbapi.cpv_exists(self.mycpv) or \ |
162 |
- '9999' in self.mycpv or \ |
163 |
- 'git' in inherited or \ |
164 |
- 'git-2' in inherited: |
165 |
- reinstall_self = True |
166 |
- |
167 |
- if reinstall_self: |
168 |
- # Load lazily referenced portage submodules into memory, |
169 |
- # so imports won't fail during portage upgrade/downgrade. |
170 |
- portage.proxy.lazyimport._preload_portage_submodules() |
171 |
- settings = self.settings |
172 |
- |
173 |
- # Make the temp directory inside $PORTAGE_TMPDIR/portage, since |
174 |
- # it's common for /tmp and /var/tmp to be mounted with the |
175 |
- # "noexec" option (see bug #346899). |
176 |
- build_prefix = os.path.join(settings["PORTAGE_TMPDIR"], "portage") |
177 |
- ensure_dirs(build_prefix) |
178 |
- base_path_tmp = tempfile.mkdtemp( |
179 |
- "", "._portage_reinstall_.", build_prefix) |
180 |
- portage.process.atexit_register(shutil.rmtree, base_path_tmp) |
181 |
- dir_perms = 0o755 |
182 |
- for subdir in "bin", "pym": |
183 |
- var_name = "PORTAGE_%s_PATH" % subdir.upper() |
184 |
- var_orig = settings[var_name] |
185 |
- var_new = os.path.join(base_path_tmp, subdir) |
186 |
- settings[var_name] = var_new |
187 |
- settings.backup_changes(var_name) |
188 |
- shutil.copytree(var_orig, var_new, symlinks=True) |
189 |
- os.chmod(var_new, dir_perms) |
190 |
- portage._bin_path = settings['PORTAGE_BIN_PATH'] |
191 |
- portage._pym_path = settings['PORTAGE_PYM_PATH'] |
192 |
- os.chmod(base_path_tmp, dir_perms) |
193 |
- # This serves so pre-load the modules. |
194 |
- _preload_elog_modules(self.settings) |
195 |
- |
196 |
- return self._merge(mergeroot, inforoot, |
197 |
- myebuild=myebuild, cleanup=cleanup, |
198 |
- mydbapi=mydbapi, prev_mtimes=prev_mtimes) |
199 |
- |
200 |
- def _merge(self, mergeroot, inforoot, myroot=None, myebuild=None, cleanup=0, |
201 |
- mydbapi=None, prev_mtimes=None): |
202 |
- """ |
203 |
@param myroot: ignored, self._eroot is used instead |
204 |
""" |
205 |
myroot = None |