| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-03 08:17:09 +0000 (Thu, 03 Jul 2008) |
| 3 |
New Revision: 10907 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Remove unused BinpkgMerge class. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-03 07:38:55 UTC (rev 10906) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-03 08:17:09 UTC (rev 10907) |
| 15 |
@@ -2452,33 +2452,6 @@ |
| 16 |
self.env = self.pkg.root_config.settings.environ() |
| 17 |
SpawnProcess.start(self) |
| 18 |
|
| 19 |
-class BinpkgMerge(Task): |
| 20 |
- |
| 21 |
- __slots__ = ("find_blockers", "ldpath_mtimes", |
| 22 |
- "pkg", "pretend", "pkg_path", "settings") |
| 23 |
- |
| 24 |
- def _get_hash_key(self): |
| 25 |
- hash_key = getattr(self, "_hash_key", None) |
| 26 |
- if hash_key is None: |
| 27 |
- self._hash_key = ("BinpkgMerge", self.pkg._get_hash_key()) |
| 28 |
- return self._hash_key |
| 29 |
- |
| 30 |
- def execute(self): |
| 31 |
- |
| 32 |
- settings = self.settings |
| 33 |
- settings["EMERGE_FROM"] = self.pkg.type_name |
| 34 |
- settings.backup_changes("EMERGE_FROM") |
| 35 |
- settings.reset() |
| 36 |
- |
| 37 |
- root_config = self.pkg.root_config |
| 38 |
- retval = portage.pkgmerge(self.pkg_path, root_config.root, |
| 39 |
- self.settings, |
| 40 |
- mydbapi=root_config.trees["bintree"].dbapi, |
| 41 |
- vartree=root_config.trees["vartree"], |
| 42 |
- prev_mtimes=self.ldpath_mtimes, |
| 43 |
- blockers=self.find_blockers) |
| 44 |
- return retval |
| 45 |
- |
| 46 |
class DependencyArg(object): |
| 47 |
def __init__(self, arg=None, root_config=None): |
| 48 |
self.arg = arg |
| 49 |
|
| 50 |
-- |
| 51 |
gentoo-commits@l.g.o mailing list |
Archives