commit fd64443c4865756eecf4e713eb8c633d667536ad
author You-Cheng Syu <youcheng@chromium.org> Tue Oct 04 13:40:51 2016 +0800
committer chrome-bot <chrome-bot@chromium.org> Tue Oct 04 05:55:49 2016 -0700
tree 7e1863c9bd26145cbf3ef8c82d94a7e5925cdf1b
parent 9fad816a2dfdc039b84d497fff362c2be8f05d3e

installer: fix symlink target name when initializing umpire

When initializing umpire with factory toolkit installer, the temporary
symlink target name should be "install_factory_toolkit.run".

BUG=none
TEST=manually

Change-Id: I69c70a386b2849735636f50c6b8180f8d9d616f6
Reviewed-on: https://chromium-review.googlesource.com/392686
Commit-Ready: Youcheng Syu <youcheng@chromium.org>
Tested-by: Youcheng Syu <youcheng@chromium.org>
Reviewed-by: Mao Huang <littlecvr@chromium.org>

py/toolkit/installer.py

diff --git a/py/toolkit/installer.py b/py/toolkit/installer.py
index ca3eacb..8b46eff 100755
--- a/py/toolkit/installer.py
+++ b/py/toolkit/installer.py
@@ -388,7 +388,7 @@
     parent_cmdline = open('/proc/%s/cmdline' % os.getppid(),
                           'r').read().rstrip('\0').split('\0')
 
-    if parent_cmdline > 1 and parent_cmdline[0] == MAKESELF_SHELL:
+    if len(parent_cmdline) > 1 and parent_cmdline[0] == MAKESELF_SHELL:
       # Get parent script name from parent process.
       exe_path = parent_cmdline[1]
     else:
@@ -401,8 +401,7 @@
   with file_utils.TempDirectory() as nano_bundle:
     bundle_toolkit_dir = os.path.join(nano_bundle, 'factory_toolkit')
     os.mkdir(bundle_toolkit_dir)
-    os.symlink(exe_path, os.path.join(bundle_toolkit_dir,
-                                      os.path.basename(exe_path)))
+    os.symlink(exe_path, os.path.join(bundle_toolkit_dir, TOOLKIT_NAME))
     umpire_bin = os.path.join(src_root, 'usr', 'local', 'factory', 'bin',
                               'umpire')
     Spawn([umpire_bin, 'init', '--board', target_board, nano_bundle],