From: Zac Medico Date: Thu, 30 Apr 2009 07:01:26 +0000 (-0000) Subject: Reorganize emerge --info display, and make sure that the "cpv was X-Git-Tag: v2.1.6.12~98 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f1db935400c93ca09d6ec1add96d50e061014aa8;p=portage.git Reorganize emerge --info display, and make sure that the "cpv was built with the following" line is shown for every package. (trunk r13304) svn path=/main/branches/2.1.6/; revision=13475 --- diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index c92078dc0..e3b7f2fb9 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -13459,16 +13459,8 @@ def action_info(settings, trees, myopts, myfiles): if valuesmap[myvar] != global_vals[myvar]: diff_values[myvar] = valuesmap[myvar] - # If a difference was found, print the info for - # this package. - if diff_values: - # Print package info - print "%s was built with the following:" % pkg.cpv - for myvar in mydesiredvars: - if myvar in diff_values: - mylist = list(diff_values[myvar]) - mylist.sort() - print "%s=\"%s\"" % (myvar, " ".join(mylist)) + print "\n%s was built with the following:" % \ + colorize("INFORM", str(pkg.cpv)) pkgsettings.setcpv(pkg) forced_flags = set(chain(pkgsettings.useforce, @@ -13521,6 +13513,17 @@ def action_info(settings, trees, myopts, myfiles): print '%s="%s"' % (varname, ' '.join(str(f) for f in flags)), print + # If a difference was found, print the info for + # this package. + if diff_values: + # Print package info + for myvar in mydesiredvars: + if myvar in diff_values: + mylist = list(diff_values[myvar]) + mylist.sort() + print "%s=\"%s\"" % (myvar, " ".join(mylist)) + print + print ">>> Attempting to run pkg_info() for '%s'" % pkg.cpv ebuildpath = vardb.findname(pkg.cpv) if not ebuildpath or not os.path.exists(ebuildpath):