Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13450 - main/branches/2.1.6/pym/_emerge
Date: Thu, 30 Apr 2009 06:55:02
Message-Id: E1LzQAe-0005Jg-FM@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-04-30 06:54:59 +0000 (Thu, 30 Apr 2009)
3 New Revision: 13450
4
5 Modified:
6 main/branches/2.1.6/pym/_emerge/__init__.py
7 Log:
8 Allow --root-deps for ROOT=/, so people can do weird things like use it with
9 -e to remerge deep runtime deps without pulling in build-time deps. It's not
10 something we really want to advertise, but it's good to leave the option
11 open in case it happens to be useful. Thanks to Ned Ludd <solar@g.o> for the
12 suggestion. (trunk r13271)
13
14 Modified: main/branches/2.1.6/pym/_emerge/__init__.py
15 ===================================================================
16 --- main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 06:54:40 UTC (rev 13449)
17 +++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 06:54:59 UTC (rev 13450)
18 @@ -5259,14 +5259,12 @@
19 edepend["DEPEND"] = ""
20
21 bdeps_root = "/"
22 - if self.target_root != "/":
23 - root_deps = self.myopts.get("--root-deps")
24 - if root_deps is not None:
25 - if root_deps is True:
26 - bdeps_root = myroot
27 - elif root_deps == "rdeps":
28 - bdeps_root = "/"
29 - edepend["DEPEND"] = ""
30 + root_deps = self.myopts.get("--root-deps")
31 + if root_deps is not None:
32 + if root_deps is True:
33 + bdeps_root = myroot
34 + elif root_deps == "rdeps":
35 + edepend["DEPEND"] = ""
36
37 deps = (
38 (bdeps_root, edepend["DEPEND"],