summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-10-25 06:02:17 +0000
committerZac Medico <zmedico@gentoo.org>2007-10-25 06:02:17 +0000
commit32c0cb6cb155d1be20d3a768f10412051affff44 (patch)
tree0643be8d45a8005d2c260337d1bc73eac817c785
parentf14272944803045cc18cf67342984010672e28a1 (diff)
downloadportage-32c0cb6cb155d1be20d3a768f10412051affff44.tar.gz
portage-32c0cb6cb155d1be20d3a768f10412051affff44.tar.bz2
portage-32c0cb6cb155d1be20d3a768f10412051affff44.zip
For the emergelog message, send in the original list of
arguments that exists before expansion of sets. svn path=/main/trunk/; revision=8290
-rw-r--r--pym/_emerge/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 6ad1c3865..1bd0ae72a 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -6494,8 +6494,8 @@ def emerge_main():
mysets = {}
# only expand sets for actions taking package arguments
+ oldargs = myfiles[:]
if myaction not in ["search", "metadata", "sync"]:
- oldargs = myfiles[:]
for s in settings.sets:
if s in myfiles:
# TODO: check if the current setname also resolves to a package name
@@ -6515,7 +6515,6 @@ def emerge_main():
if oldargs and not myfiles:
print "emerge: no targets left after set expansion"
return 0
- del oldargs
if ("--tree" in myopts) and ("--columns" in myopts):
print "emerge: can't specify both of \"--tree\" and \"--columns\"."
@@ -6661,8 +6660,9 @@ def emerge_main():
if myaction:
myelogstr+=" "+myaction
if myfiles:
- myelogstr+=" "+" ".join(myfiles)
+ myelogstr += " " + " ".join(oldargs)
emergelog(xterm_titles, " *** emerge " + myelogstr)
+ del oldargs
def emergeexitsig(signum, frame):
signal.signal(signal.SIGINT, signal.SIG_IGN)