For the emergelog message, send in the original list of

arguments that exists before expansion of sets.

svn path=/main/trunk/; revision=8290

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 6ad1c3865910791aa76220412280e5c7bc468d4d..1bd0ae72aa9f0cba020a8e49e30fc73643bf698a 100644 (file)
--- 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)