From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 14 Aug 2010 18:13:01 +0000 (-0700)
Subject: Pass $USE via IPC in order to ensure that we have the correct value for
X-Git-Tag: v2.2_rc68~212
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df8fe2b2465df7af4f1f7fadba999ae9a1235d10;p=portage.git

Pass $USE via IPC in order to ensure that we have the correct value for
built/installed packages, since the config class doesn't currently provide
a way to access built/installed $USE that would work in all possible
scenarios.
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 32cda5012..18f96b655 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -160,7 +160,7 @@ has_version() {
 	fi
 
 	if [[ -n $PORTAGE_IPC_DAEMON ]] ; then
-		"$PORTAGE_BIN_PATH"/ebuild-ipc has_version "$ROOT" "$1"
+		"$PORTAGE_BIN_PATH"/ebuild-ipc has_version "$ROOT" "$1" "$USE"
 		return $?
 	fi
 
@@ -203,7 +203,7 @@ best_version() {
 	fi
 
 	if [[ -n $PORTAGE_IPC_DAEMON ]] ; then
-		"$PORTAGE_BIN_PATH"/ebuild-ipc best_version "$ROOT" "$1"
+		"$PORTAGE_BIN_PATH"/ebuild-ipc best_version "$ROOT" "$1" "$USE"
 		return $?
 	fi
 
diff --git a/pym/portage/package/ebuild/_ipc/QueryCommand.py b/pym/portage/package/ebuild/_ipc/QueryCommand.py
index 47095cb4c..ec52e400f 100644
--- a/pym/portage/package/ebuild/_ipc/QueryCommand.py
+++ b/pym/portage/package/ebuild/_ipc/QueryCommand.py
@@ -23,14 +23,20 @@ class QueryCommand(IpcCommand):
 		"""
 		@returns: tuple of (stdout, stderr, returncode)
 		"""
-		cmd, root, atom = argv
+
+		# Note that $USE is passed via IPC in order to ensure that
+		# we have the correct value for built/installed packages,
+		# since the config class doesn't currently provide a way
+		# to access built/installed $USE that would work in all
+		# possible scenarios.
+		cmd, root, atom, use = argv
 
 		try:
 			atom = Atom(atom)
 		except InvalidAtom:
 			return ('', 'invalid atom: %s\n' % atom, 2)
 
-		use = frozenset(self.settings['PORTAGE_USE'].split())
+		use = frozenset(use.split())
 		atom = atom.evaluate_conditionals(use)
 
 		db = self._db