Add NOEXPORT=true commit message whenever import script is run.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py

 # Copyright 2014 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.
 
 """Fetches a copy of the latest state of a W3C test repository and commits.
 
 If this script is given the argument --auto-update, it will also:
  1. Upload a CL.
  2. Trigger try jobs and wait for them to complete.
  3. Make any changes that are required for new failing tests.
@@ skipping 209 matching lines @@
 
     def _commit_changes(self, commit_message):
         _log.info('Committing changes.')
         self.run(['git', 'commit', '--all', '-F', '-'], stdin=commit_message)
 
     def _has_changes(self):
         return_code, _ = self.run(['git', 'diff', '--quiet', 'HEAD'], exit_on_failure=False)
         return return_code == 1
 
     def _commit_message(self, chromium_commit, import_commit):
-        return ('Import %s\n\nUsing update-w3c-deps in Chromium %s.\n\n' %
+        return ('Import %s\n\n'
+                'Using update-w3c-deps in Chromium %s.\n\n'
+                'NOEXPORT=true' %
                 (import_commit, chromium_commit))
 
     @staticmethod
     def is_baseline(basename):
         return basename.endswith('-expected.txt')
 
     def run(self, cmd, exit_on_failure=True, cwd=None, stdin=''):
         _log.debug('Running command: %s', ' '.join(cmd))
 
         cwd = cwd or self.finder.webkit_base()
@@ skipping 90 matching lines @@
             '-m',
             description,
         ] + ['--cc=' + email for email in cc_list])
 
     def _cl_description(self):
         description = self.check_run(['git', 'log', '-1', '--format=%B'])
         build_link = self._build_link()
         if build_link:
             description += 'Build: %s\n\n' % build_link
         description += 'TBR=qyearsley@chromium.org\n'
+        # Move any NOEXPORT tag to the end of the description.
+        description = description.replace('NOEXPORT=true', '')
         description += 'NOEXPORT=true'
         return description
 
     def _build_link(self):
         """Returns a link to a job, if running on buildbot."""
         master_name = self.host.environ.get('BUILDBOT_MASTERNAME')
         builder_name = self.host.environ.get('BUILDBOT_BUILDERNAME')
         build_number = self.host.environ.get('BUILDBOT_BUILDNUMBER')
         if not (master_name and builder_name and build_number):
             return None
@@ skipping 92 matching lines @@
         """Returns a dict mapping source to dest name for layout tests that have been renamed."""
         out = self.check_run(['git', 'diff', 'origin/master', '-M100%', '--diff-filter=R', '--name-status'])
         renamed_tests = {}
         for line in out.splitlines():
             _, source_path, dest_path = line.split()
             source_test = self.finder.layout_test_name(source_path)
             dest_test = self.finder.layout_test_name(dest_path)
             if source_test and dest_test:
                 renamed_tests[source_test] = dest_test
         return renamed_tests