Make sure spawn() always initializes opt_name because later code assumes that it is.
authorZac Medico <zmedico@gentoo.org>
Wed, 14 Jan 2009 03:59:43 +0000 (03:59 -0000)
committerZac Medico <zmedico@gentoo.org>
Wed, 14 Jan 2009 03:59:43 +0000 (03:59 -0000)
(trunk r12502)

svn path=/main/branches/2.1.6/; revision=12512

pym/portage/__init__.py

index cacb6c93754bccfd6bf7cf529c01de9f5b78829e..46b702d4fda1b1ff76b98bf02a21a8a8d017e593 100644 (file)
@@ -3025,6 +3025,9 @@ def spawn(mystring, mysettings, debug=0, free=0, droppriv=0, sesandbox=0, fakero
                env=mysettings.environ()
                if mysettings.mycpv is not None:
                        keywords["opt_name"] = "[%s]" % mysettings.mycpv
+               else:
+                       keywords["opt_name"] = "[%s/%s]" % \
+                               (mysettings.get("CATEGORY",""), mysettings.get("PF",""))
 
        fd_pipes = keywords.get("fd_pipes")
        if fd_pipes is None: