| 1 |
commit: a6671c73f3d1aa74789534e5eebccbca23b48656 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 3 01:45:21 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 3 02:21:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a6671c73 |
| 7 |
|
| 8 |
emerge: enable --dynamic-deps=y by default once again (bug 646458) |
| 9 |
|
| 10 |
There's been a lot of pushback involving the --dynamic-deps=n default. |
| 11 |
What we really need is a tool to apply dependency changes in-place, |
| 12 |
without the need for a rebuild. |
| 13 |
|
| 14 |
Reverts: 2905e1c2c28d ("Disable dynamic-deps by default") |
| 15 |
Bug: https://bugs.gentoo.org/646458 |
| 16 |
|
| 17 |
man/emerge.1 | 2 +- |
| 18 |
pym/_emerge/Scheduler.py | 3 ++- |
| 19 |
pym/_emerge/create_depgraph_params.py | 6 +++--- |
| 20 |
pym/_emerge/depgraph.py | 7 +++---- |
| 21 |
4 files changed, 9 insertions(+), 9 deletions(-) |
| 22 |
|
| 23 |
diff --git a/man/emerge.1 b/man/emerge.1 |
| 24 |
index 189e6f879..f15532a1d 100644 |
| 25 |
--- a/man/emerge.1 |
| 26 |
+++ b/man/emerge.1 |
| 27 |
@@ -558,7 +558,7 @@ In dependency calculations, substitute the dependencies of installed |
| 28 |
packages with the dependencies of corresponding unbuilt ebuilds from |
| 29 |
source repositories. This causes the effective dependencies of |
| 30 |
installed packages to vary dynamically when source ebuild dependencies |
| 31 |
-are modified. This option is disabled by default. |
| 32 |
+are modified. This option is enabled by default. |
| 33 |
|
| 34 |
\fBWARNING:\fR |
| 35 |
If you want to disable \-\-dynamic\-deps, then it may be necessary to |
| 36 |
|
| 37 |
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py |
| 38 |
index 9bbc48e0a..eb1cd0108 100644 |
| 39 |
--- a/pym/_emerge/Scheduler.py |
| 40 |
+++ b/pym/_emerge/Scheduler.py |
| 41 |
@@ -352,7 +352,8 @@ class Scheduler(PollScheduler): |
| 42 |
""" |
| 43 |
self._set_graph_config(graph_config) |
| 44 |
self._blocker_db = {} |
| 45 |
- dynamic_deps = self.myopts.get("--dynamic-deps", "n") != "n" |
| 46 |
+ depgraph_params = create_depgraph_params(self.myopts, None) |
| 47 |
+ dynamic_deps = "dynamic_deps" in depgraph_params |
| 48 |
ignore_built_slot_operator_deps = self.myopts.get( |
| 49 |
"--ignore-built-slot-operator-deps", "n") == "y" |
| 50 |
for root in self.trees: |
| 51 |
|
| 52 |
diff --git a/pym/_emerge/create_depgraph_params.py b/pym/_emerge/create_depgraph_params.py |
| 53 |
index ecd65335c..2fc907d37 100644 |
| 54 |
--- a/pym/_emerge/create_depgraph_params.py |
| 55 |
+++ b/pym/_emerge/create_depgraph_params.py |
| 56 |
@@ -46,9 +46,9 @@ def create_depgraph_params(myopts, myaction): |
| 57 |
myparams["ignore_soname_deps"] = myopts.get( |
| 58 |
"--ignore-soname-deps", "y") |
| 59 |
|
| 60 |
- dynamic_deps = myopts.get("--dynamic-deps") |
| 61 |
- if dynamic_deps is not None: |
| 62 |
- myparams["dynamic_deps"] = dynamic_deps |
| 63 |
+ dynamic_deps = myopts.get("--dynamic-deps", "y") != "n" |
| 64 |
+ if dynamic_deps: |
| 65 |
+ myparams["dynamic_deps"] = True |
| 66 |
|
| 67 |
if myaction == "remove": |
| 68 |
myparams["remove"] = True |
| 69 |
|
| 70 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 71 |
index ac0afdf07..1c47b4b63 100644 |
| 72 |
--- a/pym/_emerge/depgraph.py |
| 73 |
+++ b/pym/_emerge/depgraph.py |
| 74 |
@@ -137,7 +137,7 @@ class _frozen_depgraph_config(object): |
| 75 |
self.soname_deps_enabled = ( |
| 76 |
("--usepkgonly" in myopts or "remove" in params) and |
| 77 |
params.get("ignore_soname_deps") != "y") |
| 78 |
- dynamic_deps = myopts.get("--dynamic-deps", "n") != "n" |
| 79 |
+ dynamic_deps = "dynamic_deps" in params |
| 80 |
ignore_built_slot_operator_deps = myopts.get( |
| 81 |
"--ignore-built-slot-operator-deps", "n") == "y" |
| 82 |
for myroot in trees: |
| 83 |
@@ -627,8 +627,7 @@ class depgraph(object): |
| 84 |
|
| 85 |
for myroot in self._frozen_config.trees: |
| 86 |
|
| 87 |
- dynamic_deps = self._dynamic_config.myparams.get( |
| 88 |
- "dynamic_deps", "n") != "n" |
| 89 |
+ dynamic_deps = "dynamic_deps" in self._dynamic_config.myparams |
| 90 |
preload_installed_pkgs = \ |
| 91 |
"--nodeps" not in self._frozen_config.myopts |
| 92 |
|
| 93 |
@@ -985,7 +984,7 @@ class depgraph(object): |
| 94 |
* none of the packages with changed deps are in the graph |
| 95 |
""" |
| 96 |
if (self._dynamic_config.myparams.get("changed_deps", "n") == "y" or |
| 97 |
- self._dynamic_config.myparams.get("dynamic_deps", "n") == "y"): |
| 98 |
+ "dynamic_deps" in self._dynamic_config.myparams): |
| 99 |
return |
| 100 |
|
| 101 |
report_pkgs = [] |
Archives