diff options
| author |   Stanislav Ochotnicky <sochotnicky@gmail.com> | 2009-08-14 14:58:58 +0200 |
|---|---|---|
| committer | Stanislav Ochotnicky <sochotnicky@gmail.com> | 2009-08-14 14:58:58 +0200 |
| commit | 71451936d05c089dcf534c7b3329206e0d682f81 (patch) | |
| tree | e1872e909236ea6df18aba63b8e2c5d68f786a9c | |
| parent | Fix missing information about failed packages (diff) | |
| download | collagen-71451936d05c089dcf534c7b3329206e0d682f81.tar.gz collagen-71451936d05c089dcf534c7b3329206e0d682f81.tar.bz2 collagen-71451936d05c089dcf534c7b3329206e0d682f81.zip | |
Added emerge --info back for now
| -rw-r--r-- | src/tinderbox/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tinderbox/__init__.py b/src/tinderbox/__init__.py index f1c07e2..c90e0f7 100644 --- a/src/tinderbox/__init__.py +++ b/src/tinderbox/__init__.py @@ -238,6 +238,7 @@ class Tinderbox(object): build_dir = self.get_build_dir(dep_failed) self._add_attachment(dep_pkg, "%s/temp/build.log" % build_dir) self._add_attachment(dep_pkg, "%s/temp/environment" % build_dir) + package.attachments['emerge_info']=self.get_emerge_info() package_infos.append(dep_pkg.get_info()) @@ -246,6 +247,7 @@ class Tinderbox(object): # TODO unmerge succeeded deps self._add_attachment(package, "/var/log/emerge.log") self._add_attachment(package, "%s/tinderbox.log" % config.CHROOT_LOGS) + package.attachments['emerge_info']=self.get_emerge_info() package.depends = [x[1] for x in group] package_infos.append(package.get_info()) continue @@ -258,7 +260,7 @@ class Tinderbox(object): self._add_attachment(package, "%s/environment" % settings["T"]) self._add_attachment(package, "%s/tinderbox.log" % config.CHROOT_LOGS) self._add_attachment(package, "/var/log/emerge.log") - + package.attachments['emerge_info']=self.get_emerge_info() package.depends = [x[1] for x in deps_processed] @@ -333,7 +335,8 @@ class Tinderbox(object): infoout = WritableObject() sys.stdout = infoout - # emerge.action_info(self.settings, self.trees, [], []) + cfg, trees, mtimedb = emerge.load_emerge_config() + emerge.action_info(cfg, trees, [], []) # REDO withouth emerge.action_info ret = sys.stdout.content sys.stdout = sys.__stdout__ |