commit 66652ec908c9b62a82060f9c67c9b2bef7578808
author Mike Frysinger <vapier@chromium.org> Thu Apr 24 11:42:25 2014 -0400
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri May 23 04:59:58 2014 +0000
tree 9506c1168d4c5ddc71b0882f483b0542cef367a2
parent c218e0f26f8697cae435ad5184e37f4af6f4a5a8

parallel_emerge: drop support for old portage

We don't need this transition logic anymore, so drop it.
This is the inverse of the previous attempt (CL:196860).

BUG=chromium:218085
TEST=`./build_packages` still works
TEST=`cbuildbot chromiumos-sdk` passes

Change-Id: I607d82e0d473946663235f80c315cd7cc4b760fd
Reviewed-on: https://chromium-review.googlesource.com/197320
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>

scripts/parallel_emerge.py

diff --git a/scripts/parallel_emerge.py b/scripts/parallel_emerge.py
index 31b902e..b2fec0d 100644
--- a/scripts/parallel_emerge.py
+++ b/scripts/parallel_emerge.py
@@ -80,7 +80,6 @@
 from portage._global_updates import _global_updates
 import portage
 import portage.debug
-from portage.versions import vercmp
 # pylint: enable=F0401
 
 
@@ -581,10 +580,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.defined_phases
           defined_binpkg_phases = binpkg_phases.intersection(defined_phases)
           if not defined_binpkg_phases:
             this_pkg["nodeps"] = True
@@ -916,12 +912,8 @@
                   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)
+      # pylint: disable=W0212
+      portage.process._setup_pipes(fd_pipes, close_fds=False)
 
       # Portage doesn't like when sys.stdin.fileno() != 0, so point sys.stdin
       # at the filehandle we just created in _setup_pipes.