| … | |
… | |
| 3 | # This source code is distributed under the terms of version 2 of the GNU |
3 | # This source code is distributed under the terms of version 2 of the GNU |
| 4 | # General Public License as published by the Free Software Foundation, a copy |
4 | # General Public License as published by the Free Software Foundation, a copy |
| 5 | # of which can be found in the main directory of this project. |
5 | # of which can be found in the main directory of this project. |
| 6 | Gentoo Linux Installer |
6 | Gentoo Linux Installer |
| 7 | |
7 | |
| 8 | $Id: GLIPortage.py,v 1.39 2006/02/10 02:01:58 agaffney Exp $ |
8 | $Id: GLIPortage.py,v 1.40 2006/02/11 17:26:33 agaffney Exp $ |
| 9 | """ |
9 | """ |
| 10 | |
10 | |
| 11 | import re |
11 | import re |
| 12 | import os |
12 | import os |
| 13 | import GLIUtility |
13 | import GLIUtility |
| … | |
… | |
| 164 | # Remove image_dir |
164 | # Remove image_dir |
| 165 | if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): removing " + image_dir + " for " + package) |
165 | if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): removing " + image_dir + " for " + package) |
| 166 | if not GLIUtility.exitsuccess(GLIUtility.spawn("rm -rf " + self._chroot_dir + image_dir)): |
166 | if not GLIUtility.exitsuccess(GLIUtility.spawn("rm -rf " + self._chroot_dir + image_dir)): |
| 167 | raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not remove + " + image_dir + " for " + package) |
167 | raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not remove + " + image_dir + " for " + package) |
| 168 | |
168 | |
|
|
169 | # Run env-update |
|
|
170 | if not use_root: |
|
|
171 | if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running env-update inside chroot") |
|
|
172 | if not GLIUtility.exitstatus(GLIUtility.spawn("env-update", chroot=self._chroot_dir)): |
|
|
173 | raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not run env-update for " + package) |
|
|
174 | |
| 169 | def add_pkg_to_world(self, package): |
175 | def add_pkg_to_world(self, package): |
| 170 | if package.find("/") == -1: |
176 | if package.find("/") == -1: |
| 171 | package = self.get_best_version_vdb_chroot(package) |
177 | package = self.get_best_version_vdb_chroot(package) |
| 172 | if not package: return False |
178 | if not package: return False |
| 173 | expr = re.compile('^=?(.+?/.+?)(-\d.+)?$') |
179 | expr = re.compile('^=?(.+?/.+?)(-\d.+)?$') |
Parent Directory
| 
Revision Log
| 
Patch