| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-29 00:46:54 +0000 (Tue, 29 Jul 2008) |
| 3 |
New Revision: 11256 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Redirect the FEATURES=buildsyspkg message to the log when in background mode. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-28 22:59:59 UTC (rev 11255) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-29 00:46:54 UTC (rev 11256) |
| 15 |
@@ -2321,7 +2321,7 @@ |
| 16 |
__slots__ = ("args_set", "background", "find_blockers", |
| 17 |
"ldpath_mtimes", "logger", "opts", "pkg", "pkg_count", |
| 18 |
"prefetcher", "settings", "world_atom") + \ |
| 19 |
- ("_build_dir", "_buildpkg", "_ebuild_path", "_tree") |
| 20 |
+ ("_build_dir", "_buildpkg", "_ebuild_path", "_issyspkg", "_tree") |
| 21 |
|
| 22 |
def _start(self): |
| 23 |
|
| 24 |
@@ -2433,16 +2433,13 @@ |
| 25 |
logger.log(msg, short_msg=short_msg) |
| 26 |
|
| 27 |
#buildsyspkg: Check if we need to _force_ binary package creation |
| 28 |
- issyspkg = "buildsyspkg" in features and \ |
| 29 |
+ self._issyspkg = "buildsyspkg" in features and \ |
| 30 |
system_set.findAtomForPackage(pkg) and \ |
| 31 |
not opts.buildpkg |
| 32 |
|
| 33 |
- if opts.buildpkg or issyspkg: |
| 34 |
+ if opts.buildpkg or self._issyspkg: |
| 35 |
|
| 36 |
self._buildpkg = True |
| 37 |
- if issyspkg: |
| 38 |
- portage.writemsg_stdout(">>> This is a system package, " + \ |
| 39 |
- "let's pack a rescue tarball.\n", noiselevel=-1) |
| 40 |
|
| 41 |
msg = " === (%s of %s) Compiling/Packaging (%s::%s)" % \ |
| 42 |
(pkg_count.curval, pkg_count.maxval, pkg.cpv, ebuild_path) |
| 43 |
@@ -2479,6 +2476,21 @@ |
| 44 |
self.wait() |
| 45 |
return |
| 46 |
|
| 47 |
+ if self._issyspkg: |
| 48 |
+ msg = ">>> This is a system package, " + \ |
| 49 |
+ "let's pack a rescue tarball.\n" |
| 50 |
+ |
| 51 |
+ log_path = self.settings.get("PORTAGE_LOG_FILE") |
| 52 |
+ if log_path is not None: |
| 53 |
+ log_file = open(log_path, 'a') |
| 54 |
+ try: |
| 55 |
+ log_file.write(msg) |
| 56 |
+ finally: |
| 57 |
+ log_file.close() |
| 58 |
+ |
| 59 |
+ if not self.background: |
| 60 |
+ portage.writemsg_stdout(msg, noiselevel=-1) |
| 61 |
+ |
| 62 |
packager = EbuildBinpkg(background=self.background, pkg=self.pkg, |
| 63 |
scheduler=self.scheduler, settings=self.settings) |
Archives