From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 6 Jul 2007 00:42:36 +0000 (-0000)
Subject: Fix emerge by tbz2 path so that it works properly. (trunk r7171)
X-Git-Tag: v2.1.3~88
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=78ef7dc7de38011cb1d602eaa2bead10ea619186;p=portage.git

Fix emerge by tbz2 path so that it works properly. (trunk r7171)

svn path=/main/branches/2.1.2/; revision=7173
---

diff --git a/bin/emerge b/bin/emerge
index 837833799..0b061b735 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1487,15 +1487,16 @@ class depgraph:
 					else:
 						print "\n\n!!! Binary package '"+str(x)+"' does not exist."
 						print "!!! Please ensure the tbz2 exists as specified.\n"
-						sys.exit(1)
+						return 0, myfavorites
 				mytbz2=xpak.tbz2(x)
 				mykey=mytbz2.getelements("CATEGORY")[0]+"/"+os.path.splitext(os.path.basename(x))[0]
 				if os.path.realpath(x) != \
 					os.path.realpath(self.trees[myroot]["bintree"].getname(mykey)):
 					print colorize("BAD", "\n*** You need to adjust PKGDIR to emerge this package.\n")
-					sys.exit(1)
+					return 0, myfavorites
 				if not self.create(["binary", myroot, mykey],
-					None, "--onlydeps" not in self.myopts):
+					None, "--onlydeps" not in self.myopts,
+					myuse=mytbz2.getelements("USE"), arg=x):
 					return (0,myfavorites)
 				arg_atoms.append((x, "="+mykey))
 			elif ext==".ebuild":
@@ -5786,7 +5787,6 @@ def emerge_main():
 	for x in myfiles:
 		ext = os.path.splitext(x)[1]
 		if (ext == ".ebuild" or ext == ".tbz2") and os.path.exists(os.path.abspath(x)):
-			print "emerging by path implies --oneshot... adding --oneshot to options."
 			print colorize("BAD", "\n*** emerging by path is broken and may not always work!!!\n")
 			break