Merge 39238 - Fix removing unnecessary files in export_tarball.py...

tools/export_tarball/export_tarball.py

 #!/usr/bin/python
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 This tool creates a tarball with all the sources, but without .svn directories.
 
 It can also remove files which are not strictly required for build, so that
 the resulting tarball can be reasonably small (last time it was ~110 MB).
@@ skipping 23 matching lines @@
     'webkit/tools/test/reference_build',
 )
 
 def GetSourceDirectory():
   return os.path.realpath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..', 'src'))
 
 # Workaround lack of the exclude parameter in add method in python-2.4.
 # TODO(phajdan.jr): remove the workaround when it's not needed on the bot.
 class MyTarFile(tarfile.TarFile):
+  def set_remove_nonessential_files(self, remove):
+    self.__remove_nonessential_files = remove
+
   def add(self, name, arcname=None, recursive=True, exclude=None):
-    if exclude is not None and exclude(name):
+    head, tail = os.path.split(name)
+    if tail in ('.svn', '.git'):
       return
+
+    if self.__remove_nonessential_files:
+      for nonessential_dir in NONESSENTIAL_DIRS:
+        dir_path = os.path.join(GetSourceDirectory(), nonessential_dir)
+        if name.startswith(dir_path):
+          return
+
     tarfile.TarFile.add(self, name, arcname=arcname, recursive=recursive)
 
 def main(argv):
   parser = optparse.OptionParser()
   parser.add_option("--remove-nonessential-files",
                     dest="remove_nonessential_files",
                     action="store_true", default=False)
 
   options, args = parser.parse_args(argv)
 
   if len(args) != 1:
     print 'You must provide only one argument: output file name'
     print '(without .tar.bz2 extension).'
     return 1
 
   if not os.path.exists(GetSourceDirectory()):
     print 'Cannot find the src directory.'
     return 1
 
   output_fullname = args[0] + '.tar.bz2'
   output_basename = os.path.basename(args[0])
 
-  def ShouldExcludePath(path):
-    head, tail = os.path.split(path)
-    if tail in ('.svn', '.git'):
-      return True
-
-    if not options.remove_nonessential_files:
-      return False
-    for nonessential_dir in NONESSENTIAL_DIRS:
-      if path.startswith(os.path.join(GetSourceDirectory(), nonessential_dir)):
-        return True
-
-    return False
-
   archive = MyTarFile.open(output_fullname, 'w:bz2')
+  archive.set_remove_nonessential_files(options.remove_nonessential_files)
   try:
-    archive.add(GetSourceDirectory(), arcname=output_basename,
-                exclude=ShouldExcludePath)
+    archive.add(GetSourceDirectory(), arcname=output_basename)
   finally:
     archive.close()
 
   return 0
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv[1:]))