commit fea6cfeaa11580236ae897990a80a9b06f3bd841
author Mike Frysinger <vapier@chromium.org> Thu Apr 24 11:42:25 2014 -0400
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Apr 24 21:58:20 2014 +0000
tree 11bed855ce3c9854187a14a905614ceb82321add
parent 6d47d8c285bff0405a87e3243847a8a004a23404

parallel_emerge: drop support for old portage

We don't need this transition logic anymore, so drop it.

BUG=chromium:218085
TEST=`./build_packages` still works

Change-Id: Ia99d38e18139ed3936ee32791ddd1a72688049d1
Reviewed-on: https://chromium-review.googlesource.com/196860
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/parallel_emerge.py

diff --git a/scripts/parallel_emerge.py b/scripts/parallel_emerge.py
index 94b9881..811c6cc 100644
--- a/scripts/parallel_emerge.py
+++ b/scripts/parallel_emerge.py
@@ -79,7 +79,6 @@
 from portage._global_updates import _global_updates
 import portage
 import portage.debug
-from portage.versions import vercmp
 # pylint: enable=F0401
 
 
@@ -580,10 +579,7 @@
         emerge_pkg = self.package_db.get(pkg)
         if emerge_pkg and emerge_pkg.type_name == "binary":
           this_pkg["binary"] = True
-          if 0 <= vercmp(portage.VERSION, "2.1.11.50"):
-            defined_phases = emerge_pkg.defined_phases
-          else:
-            defined_phases = emerge_pkg.metadata.defined_phases
+          defined_phases = emerge_pkg.metadata.defined_phases
           defined_binpkg_phases = binpkg_phases.intersection(defined_phases)
           if not defined_binpkg_phases:
             this_pkg["nodeps"] = True
@@ -911,12 +907,7 @@
                   2: output.fileno(),
                   sys.stdin.fileno(): sys.stdin.fileno(),
                   output.fileno(): output.fileno()}
-      if 0 <= vercmp(portage.VERSION, "2.1.11.50"):
-        # pylint: disable=W0212
-        portage.process._setup_pipes(fd_pipes, close_fds=False)
-      else:
-        # pylint: disable=W0212
-        portage.process._setup_pipes(fd_pipes)
+      portage.process._setup_pipes(fd_pipes) # pylint: disable=W0212
 
       # Portage doesn't like when sys.stdin.fileno() != 0, so point sys.stdin
       # at the filehandle we just created in _setup_pipes.