diff options
| author |   Stanislav Ochotnicky <sochotnicky@gmail.com> | 2009-08-14 13:54:12 +0200 |
|---|---|---|
| committer | Stanislav Ochotnicky <sochotnicky@gmail.com> | 2009-08-14 14:26:06 +0200 |
| commit | 4d4e7fdcec76b1afd00144d5dcd14f0838aa73f4 (patch) | |
| tree | 56f4f8cfa7451f553febb7908c20265cf5082846 | |
| parent | Use cPickle instead of pickle if available (diff) | |
| download | collagen-4d4e7fdcec76b1afd00144d5dcd14f0838aa73f4.tar.gz collagen-4d4e7fdcec76b1afd00144d5dcd14f0838aa73f4.tar.bz2 collagen-4d4e7fdcec76b1afd00144d5dcd14f0838aa73f4.zip | |
Fix possible issue with changed ebuild path
Inside chroot path to ebuild can be different, therefore it's better to
calculate it inside chroot
| -rw-r--r-- | src/tinderbox/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tinderbox/__init__.py b/src/tinderbox/__init__.py index eeb4647..c63c6e3 100644 --- a/src/tinderbox/__init__.py +++ b/src/tinderbox/__init__.py @@ -90,7 +90,6 @@ class Tinderbox(object): allversions = ["%s-%s" % (package.name, package.version)] for pkg in allversions: - ebuild = portdb.findname(pkg) archs = portdb.aux_get(pkg, ["KEYWORDS"])[0] archs = archs.split() if settings["ARCH"] not in archs and "~%s" % settings["ARCH"] not in archs: @@ -141,7 +140,7 @@ class Tinderbox(object): else: package.version = "%s-%s" % (pkgver, pkgrev) package.reinit() - self._emerge_package_subprocess(pkg, ebuild, dep_groups, package) + self._emerge_package_subprocess(pkg, dep_groups, package) sys.exit(0) except Exception, e: @@ -171,11 +170,12 @@ class Tinderbox(object): #TODO make binpkg - def _emerge_package_subprocess(self, pkg, ebuild, dep_groups, package): + def _emerge_package_subprocess(self, pkg, dep_groups, package): # We are chrooted inside WORK_CHROOT remember! porttree = self.trees[portage.root]['porttree'] portdb = porttree.dbapi vartree = self.trees[portage.root]["vartree"] + ebuild = portdb.findname(pkg) package_infos = [] |