1 |
We have prepared for this for quite a while and it's time to pull |
2 |
the plug. Disable dynamic-deps by default and restore the standard |
3 |
PMS behavior. This will cause some one-time pain but eventually will |
4 |
result in improvement of ebuild quality, especially when developers |
5 |
start experiencing the need for revbumps first hand. |
6 |
--- |
7 |
man/emerge.1 | 2 +- |
8 |
pym/_emerge/FakeVartree.py | 2 +- |
9 |
pym/_emerge/Scheduler.py | 2 +- |
10 |
pym/_emerge/depgraph.py | 4 ++-- |
11 |
pym/portage/tests/resolver/test_changed_deps.py | 1 + |
12 |
pym/portage/tests/resolver/test_virtual_slot.py | 2 +- |
13 |
6 files changed, 7 insertions(+), 6 deletions(-) |
14 |
|
15 |
diff --git a/man/emerge.1 b/man/emerge.1 |
16 |
index 3198ba028..b292954a3 100644 |
17 |
--- a/man/emerge.1 |
18 |
+++ b/man/emerge.1 |
19 |
@@ -547,7 +547,7 @@ In dependency calculations, substitute the dependencies of installed |
20 |
packages with the dependencies of corresponding unbuilt ebuilds from |
21 |
source repositories. This causes the effective dependencies of |
22 |
installed packages to vary dynamically when source ebuild dependencies |
23 |
-are modified. This option is enabled by default. |
24 |
+are modified. This option is disabled by default. |
25 |
|
26 |
\fBWARNING:\fR |
27 |
If you want to disable \-\-dynamic\-deps, then it may be necessary to |
28 |
diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py |
29 |
index ebe07bba2..3f82e97e9 100644 |
30 |
--- a/pym/_emerge/FakeVartree.py |
31 |
+++ b/pym/_emerge/FakeVartree.py |
32 |
@@ -54,7 +54,7 @@ class FakeVartree(vartree): |
33 |
is not a matching ebuild in the tree). Instances of this class are not |
34 |
populated until the sync() method is called.""" |
35 |
def __init__(self, root_config, pkg_cache=None, pkg_root_config=None, |
36 |
- dynamic_deps=True, ignore_built_slot_operator_deps=False, |
37 |
+ dynamic_deps=False, ignore_built_slot_operator_deps=False, |
38 |
soname_deps=False): |
39 |
self._root_config = root_config |
40 |
self._dynamic_deps = dynamic_deps |
41 |
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py |
42 |
index 3a38cbafd..9bbc48e0a 100644 |
43 |
--- a/pym/_emerge/Scheduler.py |
44 |
+++ b/pym/_emerge/Scheduler.py |
45 |
@@ -352,7 +352,7 @@ class Scheduler(PollScheduler): |
46 |
""" |
47 |
self._set_graph_config(graph_config) |
48 |
self._blocker_db = {} |
49 |
- dynamic_deps = self.myopts.get("--dynamic-deps", "y") != "n" |
50 |
+ dynamic_deps = self.myopts.get("--dynamic-deps", "n") != "n" |
51 |
ignore_built_slot_operator_deps = self.myopts.get( |
52 |
"--ignore-built-slot-operator-deps", "n") == "y" |
53 |
for root in self.trees: |
54 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
55 |
index 6e5ca6508..27bec3b32 100644 |
56 |
--- a/pym/_emerge/depgraph.py |
57 |
+++ b/pym/_emerge/depgraph.py |
58 |
@@ -137,7 +137,7 @@ class _frozen_depgraph_config(object): |
59 |
self.soname_deps_enabled = ( |
60 |
("--usepkgonly" in myopts or "remove" in params) and |
61 |
params.get("ignore_soname_deps") != "y") |
62 |
- dynamic_deps = myopts.get("--dynamic-deps", "y") != "n" |
63 |
+ dynamic_deps = myopts.get("--dynamic-deps", "n") != "n" |
64 |
ignore_built_slot_operator_deps = myopts.get( |
65 |
"--ignore-built-slot-operator-deps", "n") == "y" |
66 |
for myroot in trees: |
67 |
@@ -627,7 +627,7 @@ class depgraph(object): |
68 |
for myroot in self._frozen_config.trees: |
69 |
|
70 |
dynamic_deps = self._dynamic_config.myparams.get( |
71 |
- "dynamic_deps", "y") != "n" |
72 |
+ "dynamic_deps", "n") != "n" |
73 |
preload_installed_pkgs = \ |
74 |
"--nodeps" not in self._frozen_config.myopts |
75 |
|
76 |
diff --git a/pym/portage/tests/resolver/test_changed_deps.py b/pym/portage/tests/resolver/test_changed_deps.py |
77 |
index 2421c531f..420a00172 100644 |
78 |
--- a/pym/portage/tests/resolver/test_changed_deps.py |
79 |
+++ b/pym/portage/tests/resolver/test_changed_deps.py |
80 |
@@ -52,6 +52,7 @@ class ChangedDepsTestCase(TestCase): |
81 |
options = { |
82 |
"--update": True, |
83 |
"--deep": True, |
84 |
+ "--dynamic-deps": "y", |
85 |
"--usepkg": True, |
86 |
}, |
87 |
mergelist = ["app-misc/B-0"] |
88 |
diff --git a/pym/portage/tests/resolver/test_virtual_slot.py b/pym/portage/tests/resolver/test_virtual_slot.py |
89 |
index cee1a2373..ef4bd367a 100644 |
90 |
--- a/pym/portage/tests/resolver/test_virtual_slot.py |
91 |
+++ b/pym/portage/tests/resolver/test_virtual_slot.py |
92 |
@@ -142,7 +142,7 @@ class VirtualSlotResolverTestCase(TestCase): |
93 |
# bug 526160 - test for missed pypy sub-slot update |
94 |
ResolverPlaygroundTestCase( |
95 |
["@world"], |
96 |
- options = {"--update": True, "--deep": True}, |
97 |
+ options = {"--update": True, "--deep": True, "--dynamic-deps": "y"}, |
98 |
success=True, |
99 |
mergelist = ['dev-python/pypy-2.4.0', |
100 |
'virtual/pypy-2.4.0', |
101 |
-- |
102 |
2.15.1 |