diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-11-16 00:33:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-16 00:33:42 +0000 |
| commit | cc123ba4e48a7a5367210fdc7421f81a73465a14 (patch) | |
| tree | 2f7248203f14f37dd9e3e10bbae785da893a439e | |
| parent | 10e3eac93731fae3fc8b157314495c31cb067e41 (diff) | |
| download | portage-cc123ba4e48a7a5367210fdc7421f81a73465a14.tar.gz portage-cc123ba4e48a7a5367210fdc7421f81a73465a14.tar.bz2 portage-cc123ba4e48a7a5367210fdc7421f81a73465a14.zip | |
Bug #292910 - Don't mix print() and writemsg_stdout(), in order to avoid
buffering issues. (trunk r14818)
svn path=/main/branches/2.1.7/; revision=14836
| -rw-r--r-- | pym/_emerge/search.py | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/pym/_emerge/search.py b/pym/_emerge/search.py index ac39efc20..dd11c4f0c 100644 --- a/pym/_emerge/search.py +++ b/pym/_emerge/search.py @@ -247,9 +247,11 @@ class search(object): def output(self): """Outputs the results of the search.""" - print("\b\b \n[ Results for search key : "+white(self.searchkey)+" ]") - print("[ Applications found : "+white(str(self.mlen))+" ]") - print(" ") + msg = [] + msg.append("\b\b \n[ Results for search key : " + \ + bold(self.searchkey) + " ]\n") + msg.append("[ Applications found : " + \ + bold(str(self.mlen)) + " ]\n\n") vardb = self.vartree.dbapi for mtype in self.matches: for match,masked in self.matches[mtype]: @@ -272,12 +274,13 @@ class search(object): desc, homepage, license = self.portdb.aux_get( full_package, ["DESCRIPTION","HOMEPAGE","LICENSE"]) except KeyError: - print("emerge: search: aux_get() failed, skipping") + msg.append("emerge: search: aux_get() failed, skipping\n") continue if masked: - print(green("*")+" "+white(match)+" "+red("[ Masked ]")) + msg.append(green("*") + " " + \ + white(match) + " " + red("[ Masked ]") + "\n") else: - print(green("*")+" "+white(match)) + msg.append(green("*") + " " + bold(match) + "\n") myversion = self.getVersion(full_package, search.VERSION_RELEASE) mysum = [0,0] @@ -326,12 +329,14 @@ class search(object): file_size_str = mystr + " kB" if self.verbose: - msg = [] if available: - print(" ", darkgreen("Latest version available:"),myversion) - print(" ", self.getInstallationStatus(mycat+'/'+mypkg)) + msg.append(" %s %s\n" % \ + (darkgreen("Latest version available:"), + myversion)) + msg.append(" %s\n" % \ + self.getInstallationStatus(mycat+'/'+mypkg)) if myebuild: - print(" %s %s" % \ + msg.append(" %s %s\n" % \ (darkgreen("Size of files:"), file_size_str)) msg.append(" " + darkgreen("Homepage:") + \ " " + homepage + "\n") @@ -339,7 +344,7 @@ class search(object): + " " + desc + "\n") msg.append(" " + darkgreen("License:") + \ " " + license + "\n\n") - writemsg_stdout(''.join(msg), noiselevel=-1) + writemsg_stdout(''.join(msg), noiselevel=-1) # # private interface # |