commit b7e4426c87981e70f1f80eb624908eaab05ff9d0
author Jon Salz <jsalz@chromium.org> Wed May 07 15:53:37 2014 +0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri May 09 08:26:02 2014 +0000
tree 416e216cfc04fef9375adb7e7fe385cb714d9532
parent b8ae376fbe2f0ee181c65be81f77864a7041858c

Fix up permissions (chown root, chmod go+rX) when installing.

BUG=chrome-os-partner:28625
TEST=Unit tests, manual, buildbot

Change-Id: I54bdf5bea865333c3d88dd756d438b95209551dc
Reviewed-on: https://chromium-review.googlesource.com/198644
Reviewed-by: Bowgo Tsai <bowgotsai@chromium.org>
Reviewed-by: Vic Yang <victoryang@chromium.org>
Reviewed-by: Jon Salz <jsalz@chromium.org>
Commit-Queue: Jon Salz <jsalz@chromium.org>
Tested-by: Jon Salz <jsalz@chromium.org>

py/toolkit/installer.py

diff --git a/py/toolkit/installer.py b/py/toolkit/installer.py
index 17e7014..01d01e3 100755
--- a/py/toolkit/installer.py
+++ b/py/toolkit/installer.py
@@ -89,6 +89,9 @@
                  as its default value except for unit testing.
   """
 
+  # Whether to sudo when rsyncing; set to False for testing.
+  _sudo = True
+
   def __init__(self, src, dest, no_enable, system_root='/'):
     self._src = src
     self._system_root = system_root
@@ -179,25 +182,29 @@
           '***' % self._tag_file)
     return ret
 
-  def _Rsync(self, src, dest):
-    print '***   %s -> %s' % (src, dest)
-    Spawn(['rsync', '-a', src + '/', dest],
-          sudo=True, log=True, check_output=True)
-
   def Install(self):
     print '*** Installing factory toolkit...'
-    self._Rsync(self._usr_local_src, self._usr_local_dest)
-    self._Rsync(self._var_src, self._var_dest)
+    for src, dest in ((self._usr_local_src, self._usr_local_dest),
+                      (self._var_src, self._var_dest)):
+      # Change the source directory to root, and add group/world read
+      # permissions.  This is necessary because when the toolkit was
+      # unpacked, the user may not have been root so the permessions
+      # may be hosed.  This is skipped for testing.
+      if self._sudo:
+        Spawn(['chown', '-R', 'root', src],
+              sudo=True, log=True, check_call=True)
+        Spawn(['chmod', '-R', 'go+rX', src],
+              sudo=True, log=True, check_call=True)
+      print '***   %s -> %s' % (src, dest)
+      Spawn(['rsync', '-a', src + '/', dest],
+            sudo=self._sudo, log=True, check_output=True)
 
     if self._no_enable:
       print '*** Removing factory enabled tag...'
-      try:
-        os.unlink(self._tag_file)
-      except OSError:
-        pass
+      Spawn(['rm', '-f', self._tag_file], sudo=True, log=True, check_call=True)
     else:
       print '*** Installing factory enabled tag...'
-      open(self._tag_file, 'w').close()
+      Spawn(['touch', self._tag_file], sudo=True, log=True, check_call=True)
 
     print '*** Installation completed.'