Changeset 53887 in webkit

Timestamp:

Jan 26, 2010 7:04:35 PM (14 years ago)

Author:

Chris Jerdonek

Message:

2010-01-26 Chris Jerdonek <Chris Jerdonek>

Reviewed by Eric Seidel.

The Python autoinstall cache directory now only gets created
in the directory containing autoinstall.py.

​https://bugs.webkit.org/show_bug.cgi?id=33365

• Scripts/webkitpy/autoinstall.py:
  • Also added a README file to the cache directory saying where it came from.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/autoinstall.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-26  Chris Jerdonek  <cjerdonek@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        The Python autoinstall cache directory now only gets created
+        in the directory containing autoinstall.py.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33365
+
+        * Scripts/webkitpy/autoinstall.py:
+          - Also added a README file to the cache directory saying
+            where it came from.
+
 2010-01-26  Chris Jerdonek  <cjerdonek@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/autoinstall.py

@@ -180 +180 @@
 
     def __init__(self, directory=None):
-        self.directory = directory or "./autoinstall.cache.d/"
+        if directory is None:
+            # Default to putting the cache directory in the same directory
+            # as this file.
+            containing_directory = os.path.dirname(__file__)
+            directory = os.path.join(containing_directory, "autoinstall.cache.d");
+
+        self.directory = directory
         try:
             if not os.path.exists(self.directory):
-                _logger.debug("Creating cache directory '%s'." % self.directory)
-                os.mkdir(self.directory)
+                self._create_cache_directory()
         except Exception, err:
             _logger.exception(err)
@@ -190 +195 @@
         _logger.info("Using cache directory '%s'." % self.directory)
     
+    def _create_cache_directory(self):
+        _logger.debug("Creating cache directory '%s'." % self.directory)
+        os.mkdir(self.directory)
+        readme_path = os.path.join(self.directory, "README")
+        with open(readme_path, "w") as f:
+            f.write("This directory was auto-generated by '%s'.\n"
+                    "It is safe to delete.\n" % __file__)
+
     def get(self, url):
         _logger.info("Getting '%s' from cache." % url)