diff options
| author |   Stanislav Ochotnicky <sochotnicky@gmail.com> | 2009-08-16 19:36:59 +0200 |
|---|---|---|
| committer | Stanislav Ochotnicky <sochotnicky@gmail.com> | 2009-08-16 19:36:59 +0200 |
| commit | 29bf8e8a95be8c2a6d360ba1a5bf103e81a8b2e2 (patch) | |
| tree | e2b2304c1f41c4e65c3fc5e48db3be2c5114072a | |
| parent | Remove BASE_CHROOT.tar after modifications (diff) | |
| download | collagen-master.tar.gz collagen-master.tar.bz2 collagen-master.zip | |
| -rw-r--r-- | src/collagen/tinderbox/__init__.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/collagen/tinderbox/__init__.py b/src/collagen/tinderbox/__init__.py index c5d235d..8177587 100644 --- a/src/collagen/tinderbox/__init__.py +++ b/src/collagen/tinderbox/__init__.py @@ -45,13 +45,15 @@ class Tinderbox(object): self.hostname = config.MATCHBOX_HOST self.port = config.MATCHBOX_PORT self.sock = None + self.__portage_reinit() + init_logging('/tmp') + def __portage_reinit(self): self.settings = portage.config(clone=portage.settings) self.trees = portage.create_trees() self.settings["PORTAGE_VERBOSE"]="1" self.settings.backup_changes("PORTAGE_VERBOSE") self.setconf = psets.SetConfig([], self.settings, self.trees) - init_logging('/tmp') def start_tinderbox(self): @@ -150,6 +152,7 @@ class Tinderbox(object): # setup logging! os.chroot(config.WORK_CHROOT) os.chdir("/") + self.__portage_reinit() init_logging(config.CHROOT_LOGS) pkgname, pkgver, pkgrev = portage.pkgsplit(pkg) @@ -544,7 +547,7 @@ class Package(object): return {} cat, pkg = portage.catsplit(cpv) - dblink = portage.dblink(cat, pkg, portage.root, vartree.settings, + dblink = portage.dblink(cat, pkg, portage.root, vartree.settings, treetype="vartree", vartree=vartree) - + return dblink.getcontents() |