commit 0d1381684498b9d1e28dc98a66f37ac06e5b603d
author Bertrand SIMONNET <bsimonnet@chromium.org> Thu Apr 30 17:25:15 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri May 01 18:34:35 2015 +0000
tree 39445eccd4bb3fcce3a0ab7eea574ae3646be433
parent b3ddc29cb348a2cbc88e575148cf494acc56cc19

builder: Add helper to get the path to a sysroot wrapper.

Nits from https://chromium-review.googlesource.com/#/c/268399/.

BUG=None
TEST=unittests.

Change-Id: I9b6ade292ac215fc83bb827ba939b1a717c57c48
Reviewed-on: https://chromium-review.googlesource.com/268679
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Bertrand Simonnet <bsimonnet@chromium.org>
Tested-by: Bertrand Simonnet <bsimonnet@chromium.org>

builder.py

diff --git a/builder.py b/builder.py
index 2b27803..e37e215 100644
--- a/builder.py
+++ b/builder.py
@@ -18,6 +18,20 @@
 import log_util
 
 
+# Relative path to the wrapper directory inside the sysroot.
+_SYSROOT_BUILD_BIN = 'build/bin'
+
+
+def _SysrootCmd(sysroot, cmd):
+  """Path to the sysroot wrapper for |cmd|.
+
+  Args:
+    sysroot: Path to the sysroot.
+    cmd: Name of the command.
+  """
+  return os.path.join(sysroot, _SYSROOT_BUILD_BIN, cmd)
+
+
 # Module-local log function.
 def _Log(message, *args):
   return log_util.LogWithTag('BUILD', message, *args)
@@ -92,7 +106,7 @@
   Files matching DEFAULT_INSTALL_MASK are not included in the tarball.
   """
   # Portage internal api expects the sysroot to ends with a '/'.
-  sysroot = sysroot.rstrip('/') + '/'
+  sysroot = os.path.join(sysroot, '')
 
   gmerge_pkgdir = os.path.join(sysroot, 'gmerge-packages')
   stripped_link = os.path.join(sysroot, 'stripped-packages')
@@ -128,8 +142,7 @@
   # Remove any stale packages that exist in the local binhost but are not
   # installed anymore.
   if bindb_matches - installed_matches:
-    subprocess.check_call([os.path.join(sysroot, 'build', 'bin', 'eclean'),
-                                        '-d', 'packages'])
+    subprocess.check_call([_SysrootCmd(sysroot, 'eclean'), '-d', 'packages'])
 
   # Remove any stale packages that exist in the gmerge binhost but are not
   # installed anymore.
@@ -161,7 +174,7 @@
   if changed:
     env_copy = os.environ.copy()
     env_copy['PKGDIR'] = gmerge_pkgdir
-    cmd = [os.path.join(sysroot, 'build', 'bin', 'emaint'), '-f', 'binhost']
+    cmd = [_SysrootCmd(sysroot, 'emaint'), '-f', 'binhost']
     subprocess.check_call(cmd, env=env_copy)
 
   return bool(installed_matches)
@@ -212,7 +225,7 @@
       usepkg = additional_args.get('usepkg')
       if not usepkg:
         rc = subprocess.call(
-            [os.path.join(sysroot, 'build', 'bin', 'emerge'), pkg],
+            [_SysrootCmd(sysroot, 'emerge'), pkg],
             env=env_copy)
         if rc != 0:
           return self.SetError('Could not emerge ' + pkg)