| 1 |
commit: 967bc855b7e4db529afbe8b7bf7f8ed7ea55858a |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 28 22:20:35 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 28 22:20:35 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=967bc855 |
| 7 |
|
| 8 |
ResolverPlayground: remove unused root attribute |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/tests/emerge/test_simple.py | 1 - |
| 12 |
pym/portage/tests/resolver/ResolverPlayground.py | 7 +++---- |
| 13 |
2 files changed, 3 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py |
| 16 |
index 4110b55..7ed679d 100644 |
| 17 |
--- a/pym/portage/tests/emerge/test_simple.py |
| 18 |
+++ b/pym/portage/tests/emerge/test_simple.py |
| 19 |
@@ -138,7 +138,6 @@ pkg_info() { |
| 20 |
eprefix = settings["EPREFIX"] |
| 21 |
eroot = settings["EROOT"] |
| 22 |
trees = playground.trees |
| 23 |
- root = playground.root |
| 24 |
portdb = trees[eroot]["porttree"].dbapi |
| 25 |
portdir = settings["PORTDIR"] |
| 26 |
var_cache_edb = os.path.join(eprefix, "var", "cache", "edb") |
| 27 |
|
| 28 |
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py |
| 29 |
index 57cdebe..1a752be 100644 |
| 30 |
--- a/pym/portage/tests/resolver/ResolverPlayground.py |
| 31 |
+++ b/pym/portage/tests/resolver/ResolverPlayground.py |
| 32 |
@@ -17,7 +17,7 @@ from portage.package.ebuild.config import config |
| 33 |
from portage.package.ebuild.digestgen import digestgen |
| 34 |
from portage._sets import load_default_config |
| 35 |
from portage._sets.base import InternalPackageSet |
| 36 |
-from portage.util import ensure_dirs |
| 37 |
+from portage.util import ensure_dirs, normalize_path |
| 38 |
from portage.versions import catsplit |
| 39 |
|
| 40 |
import _emerge |
| 41 |
@@ -65,9 +65,8 @@ class ResolverPlayground(object): |
| 42 |
profile: settings defined by the profile. |
| 43 |
""" |
| 44 |
self.debug = debug |
| 45 |
- self.root = "/" |
| 46 |
- self.eprefix = tempfile.mkdtemp() |
| 47 |
- self.eroot = self.root + self.eprefix.lstrip(os.sep) + os.sep |
| 48 |
+ self.eprefix = normalize_path(tempfile.mkdtemp()) |
| 49 |
+ self.eroot = self.eprefix + os.sep |
| 50 |
self.distdir = os.path.join(self.eroot, "var", "portage", "distfiles") |
| 51 |
self.portdir = os.path.join(self.eroot, "usr/portage") |
| 52 |
self.vdbdir = os.path.join(self.eroot, "var/db/pkg") |
Archives