Remove execute bit from binaries install in the toolchain

lib/naclports/binary_package.py

 # Copyright (c) 2014 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import posixpath
 import shutil
+import stat
 import tarfile
 
 from naclports import configuration, package, util, error
 
 PAYLOAD_DIR = 'payload'
 
 ELF_MAGIC = '\x7fELF'
 
 def IsElfFile(filename):
   if os.path.islink(filename):
     return False
   with open(filename) as f:
     header = f.read(4)
   return header == ELF_MAGIC
 
 
-def FilterOutExecutables(filenames, root):
-  rtn = []
-  for name in filenames:
-    full_name = os.path.join(root, name)
-    if os.path.split(name)[0] == 'bin' and IsElfFile(full_name):
-      continue
-    rtn.append(name)
-
-  return rtn
-
-
 def InstallFile(filename, old_root, new_root):
   """Install a single file by moving it into a new location.
 
   Args:
     filename: Relative name of file to install.
     old_root: The current location of the file.
     new_root: The new desired root for the file.
   """
   oldname = os.path.join(old_root, filename)
 
   util.LogVerbose('install: %s' % filename)
 
   newname = os.path.join(new_root, filename)
   dirname = os.path.dirname(newname)
   if not os.path.isdir(dirname):
     util.Makedirs(dirname)
   os.rename(oldname, newname)
 
+  # When install binarie ELF files into the toolchain direcoties, remove
+  # the X bit so that they do not found when searching the PATH.
+  if IsElfFile(newname):
+    mode = os.stat(newname).st_mode
+    mode = mode & ~(stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
+    os.chmod(newname, mode)
+
+
 
 def RelocateFile(filename, dest):
   """Perform in-place mutations on file contents to handle new location.
 
   There are a few file types that have absolute pathnames embedded
   and need to be modified in some way when being installed to
   a particular location. For most file types this method does nothing.
   """
   # Only relocate certain file types.
   modify = False
@@ skipping 74 matching lines @@
     Currently only packages built with the same SDK major version
     are installable.
     """
     return self.BUILD_SDK_VERSION == util.GetSDKVersion()
 
   def GetPkgInfo(self):
     """Extract the contents of the pkg_info file from the binary package."""
     with tarfile.open(self.filename) as tar:
       return tar.extractfile('./pkg_info').read()
 
-  def Install(self):
+  def Install(self, force):
     """Install binary package into toolchain directory."""
     with util.InstallLock(self.config):
-      self._Install()
+      self._Install(force)
 
-  def _Install(self):
+  def _Install(self, force):
     dest = util.GetInstallRoot(self.config)
     dest_tmp = os.path.join(dest, 'install_tmp')
     if os.path.exists(dest_tmp):
       shutil.rmtree(dest_tmp)
 
     if self.IsAnyVersionInstalled():
       raise error.Error('package already installed: %s' % self.InfoString())
 
     self.LogStatus('Installing')
     util.LogVerbose('installing from: %s' % self.filename)
     util.Makedirs(dest_tmp)
 
     names = []
     try:
       with tarfile.open(self.filename) as tar:
         for info in tar:
           if info.isdir():
             continue
           name = posixpath.normpath(info.name)
           if name == 'pkg_info':
             continue
           if not name.startswith(PAYLOAD_DIR + '/'):
             raise error.PkgFormatError('invalid file in package: %s' % name)
 
           name = name[len(PAYLOAD_DIR) + 1:]
           names.append(name)
 
-        for name in names:
-          full_name = os.path.join(dest, name)
-          if os.path.exists(full_name):
-            raise error.Error('file already exists: %s' % full_name)
+        if not force:
+          for name in names:
+            full_name = os.path.join(dest, name)
+            if os.path.exists(full_name) :
+              raise error.Error('file already exists: %s' % full_name)
 
         tar.extractall(dest_tmp)
         payload_tree = os.path.join(dest_tmp, PAYLOAD_DIR)
 
-        # Filter out ELF binaries in the bin directory.  We don't want NaCl
-        # exectuables installed in the toolchain's bin directory since we
-        # add this to the PATH during the build process, and NaCl executables
-        # can't be run on the host system (not without sel_ldr anyway).
-        names = FilterOutExecutables(names, payload_tree)
         for name in names:
           InstallFile(name, payload_tree, dest)
     finally:
       shutil.rmtree(dest_tmp)
 
     for name in names:
       RelocateFile(name, dest)
 
     self.WriteFileList(names)
     self.WriteStamp()
 
   def WriteStamp(self):
     """Write stamp file containing pkg_info."""
     filename = util.GetInstallStamp(self.NAME, self.config)
     util.LogVerbose('stamp: %s' % filename)
     pkg_info = self.GetPkgInfo()
     with open(filename, 'w') as f:
       f.write(pkg_info)
 
   def WriteFileList(self, file_names):
     """Write the file list for this package."""
     filename = self.GetListFile()
     dirname = os.path.dirname(filename)
     if not os.path.isdir(dirname):
       util.Makedirs(dirname)
     with open(filename, 'w') as f:
       for name in file_names:
         f.write(name + '\n')