Revert "parallel_emerge: Work around Portage library bug with usepkg"
This reverts commit 14e53987cfbb1e99fa72f7517910acbb4e8ca5d4.
The revert is required to fix sdk builder breakage.
BUG=chromium:757824, chromium:757147
TEST=Chromiumos-sdk builder works after reverting the CL.
TEST=https://uberchromegw.corp.google.com/i/chromiumos.tryserver/builders/chromiumos-sdk/builds/2504
Change-Id: Ifa65f82f9b39b27eb56b8152adf14103202a2b5f
Reviewed-on: https://chromium-review.googlesource.com/625377
Trybot-Ready: Brian Norris <briannorris@chromium.org>
Tested-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Jason Clinton <jclinton@chromium.org>
Commit-Queue: Jason Clinton <jclinton@chromium.org>
diff --git a/scripts/parallel_emerge.py b/scripts/parallel_emerge.py
index 04145f3..f364529 100644
--- a/scripts/parallel_emerge.py
+++ b/scripts/parallel_emerge.py
@@ -592,17 +592,7 @@
binpkg_phases = set(["setup", "preinst", "postinst"])
needed_dep_types = set(["blocker", "buildtime", "buildtime_slot_op",
"runtime", "runtime_slot_op"])
- ignored_dep_types = set(["ignored", "runtime_post", "soft"])
-
- # There's a bug in the Portage library where it always returns 'optional'
- # and never 'buildtime' for the digraph while --usepkg is enabled; even
- # when the package is being rebuilt. To work around this, we treat
- # 'optional' as needed when we are using --usepkg. See crbug.com/756240 .
- if "--usepkg" in self.emerge.opts:
- needed_dep_types.add("optional")
- else:
- ignored_dep_types.add("optional")
-
+ ignored_dep_types = set(["ignored", "optional", "runtime_post", "soft"])
all_dep_types = ignored_dep_types | needed_dep_types
for pkg in packages: