Changeset 78

Timestamp:

06/25/06 06:18:53 (2 years ago)

Author:

mk

Message:

Fixed installation index bugs.

Files:

• branches/mk/cheesecake/cheesecake_index.py (modified) (9 diffs)
• branches/mk/cheesecake/util.py (modified) (2 diffs)

branches/mk/cheesecake/cheesecake_index.py

@@ -27 +27 @@
-from util import pad_with_dots, pad_left_spaces, pad_right_spaces, pad_msg, pad_line
-from util import run_cmd, command_successful
-
+, unegg_package
-from util import mkdirs
-from util import StdoutRedirector
@@ -526 +526 @@
-    distance_penalty = -5
-
-
+found_locally, 
-        if download_url:
-            self.value = self.max_value
@@ -545 +545 @@
-                self.details += " directly from the Cheese Shop"
-        else:
+            if found_locally:
+                self.details = "found on local filesystem"
-            self.value = 0
-
@@ -840 +842 @@
-            "tgz": untar_package,
-            "zip": unzip_package,
-zip
+egg
-        }
-
@@ -992 +994 @@
-          found_on_cheeseshop : bool
-              Whenever package has been found on CheeseShop.
+          found_locally : bool
+              Whenever package has been already installed.
-        """
-        self.log.info("Trying to download package %s from PyPI using setuptools utilities" % self.name)
@@ -1047 +1051 @@
-        self.distance_from_pypi = 0
-        self.found_on_cheeseshop = False
-
-
+
+
+
-            s = re.search(r"Reading http(.*)", line)
-            if s:
@@ -1063 +1068 @@
-        self.package = self.get_package_from_path(output)
-        self.log.info("Downloaded package %s from %s" % (self.package, self.download_url))
+
+        if os.path.isdir(self.sandbox_pkg_file):
+            self.found_locally = True
-
-        if re.search(r"cheeseshop.python.org", self.download_url):
@@ -1203 +1211 @@
-                           {'sandbox': self.sandbox_install_dir}}
-            rc, output = run_cmd("easy_install --no-deps --prefix %s %s" % \
-
+
+
-                                 environment)
-        else:
-
-
-
+
+
-                package_dir = self.sandbox
-            cwd = os.getcwd()
-            os.chdir(package_dir)
-
+
+
-            os.chdir(cwd)
-
@@ -1221 +1230 @@
-            self.log('*** End of captured output.')
-        else:
+            self.log('Installation into %s successful.' % \
+                     self.sandbox_install_dir)
-            self.installed = True
-

branches/mk/cheesecake/util.py

@@ -1 +1 @@
-import os
+import shutil
-import sys
-import tarfile
@@ -149 +150 @@
-    return tarinfo.name.split(os.sep)[0]
-
+def unegg_package(package, destination):
+    """Unpack given egg to the `destination` directory.
+
+    Return name of unpacked directory or None on error.
+    """
+    if os.path.isdir(package):
+        package_name = os.path.basename(package)
+        destination = os.path.join(destination, package_name)
+        shutil.copytree(package, destination, symlinks=True)
+        return package_name
+    else:
+        return unzip_package(package, destination)
+
-def mkdirs(dir):
-    """Make directory with parent directories as needed.