diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-22 02:02:54 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-22 02:02:54 +0000 |
| commit | 412b29b25efda0ddebe68eb67b807e45e2a8e24b (patch) | |
| tree | 8a6a4db74868e7ff432b4afc3b47f265404ab221 | |
| parent | b1e8cc68d7f0360d24df8ca4c78d2df974f64456 (diff) | |
| download | portage-412b29b25efda0ddebe68eb67b807e45e2a8e24b.tar.gz portage-412b29b25efda0ddebe68eb67b807e45e2a8e24b.tar.bz2 portage-412b29b25efda0ddebe68eb67b807e45e2a8e24b.zip | |
Redirect dblink._preserve_libs() messages to the log when in background mode.
svn path=/main/trunk/; revision=11161
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 4b77ac133..208539818 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2124,6 +2124,7 @@ class dblink(object): return False def _preserve_libs(self, srcroot, destroot, mycontents, counter, inforoot): + showMessage = self._display_merge # read global reverse NEEDED map linkmap = self.vartree.dbapi.linkmap linkmap.rebuild(include_file=os.path.join(inforoot, "NEEDED.ELF.2")) @@ -2217,9 +2218,11 @@ class dblink(object): # skip existing files so the 'new' libs aren't overwritten if os.path.exists(os.path.join(srcroot, x.lstrip(os.sep))): continue - print "injecting %s into %s" % (x, srcroot) + showMessage("injecting %s into %s\n" % (x, srcroot), + noiselevel=-1) if not os.path.exists(os.path.join(destroot, x.lstrip(os.sep))): - print "%s does not exist so can't be preserved" % x + showMessage("%s does not exist so can't be preserved\n" % x, + noiselevel=-1) continue mydir = os.path.join(srcroot, os.path.dirname(x).lstrip(os.sep)) if not os.path.exists(mydir): |