[Python-checkins] python/nondist/sandbox/setuptools/setuptools/command build_py.py, 1.2, 1.3 easy_install.py, 1.20, 1.21

[pje@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32307/setuptools/command

Modified Files:
	build_py.py easy_install.py 
Log Message:
Fix bugs reported by Ian Bicking, Walter Doerwald, and Vincenzo Di Massa.


Index: build_py.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/build_py.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- build_py.py	5 Apr 2004 20:21:53 -0000	1.2
+++ build_py.py	11 Aug 2005 00:37:37 -0000	1.3
@@ -39,7 +39,7 @@
     def get_data_files(self):
         """Generate list of '(package,src_dir,build_dir,filenames)' tuples"""
         data = []
-        for package in self.packages:
+        for package in self.packages or ():
             # Locate package source directory
             src_dir = self.get_package_dir(package)
 

Index: easy_install.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/easy_install.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- easy_install.py	7 Aug 2005 01:03:36 -0000	1.20
+++ easy_install.py	11 Aug 2005 00:37:37 -0000	1.21
@@ -269,7 +269,6 @@
                 "%r already exists in %s; can't do a checkout there" %
                 (spec.key, self.build_directory)
             )
-            
 
 
 
@@ -281,7 +280,8 @@
 
 
 
-        
+
+
 
 
 
@@ -381,7 +381,7 @@
         if dist not in requirement:
             return
 
-        if deps or self.always_copy:            
+        if deps or self.always_copy:
             log.info("Processing dependencies for %s", requirement)
         else:
             return
@@ -448,7 +448,7 @@
                     setup_base = dist_filename
         ensure_directory(dst); shutil.move(setup_base, dst)
         return dst
-        
+
     def install_script(self, dist, script_name, script_text, dev_path=None):
         log.info("Installing %s script to %s", script_name,self.script_dir)
         target = os.path.join(self.script_dir, script_name)
@@ -502,10 +502,11 @@
         if os.path.isfile(dist_filename):
             unpack_archive(dist_filename, tmpdir, self.unpack_progress)
         elif os.path.isdir(dist_filename):
-            # note that setup_base==tmpdir here if this is a svn checkout
             setup_base = os.path.abspath(dist_filename)
 
-        if setup_base==tmpdir and self.build_directory and spec is not None:
+        if (setup_base.startswith(tmpdir)   # something we downloaded
+            and self.build_directory and spec is not None
+        ):
             setup_base = self.maybe_move(spec, dist_filename, setup_base)
 
         # Find the setup.py file
@@ -530,7 +531,6 @@
         else:
             return self.build_and_install(setup_script, setup_base)
 
-
     def egg_distribution(self, egg_path):
         if os.path.isdir(egg_path):
             metadata = PathMetadata(egg_path,os.path.join(egg_path,'EGG-INFO'))
@@ -1091,7 +1091,7 @@
                     self.paths.pop()    # skip it
                     self.dirty = True   # we cleaned up, so we're dirty now :)
                     continue
-                seen[path] = 1                
+                seen[path] = 1
 
         while self.paths and not self.paths[-1].strip(): self.paths.pop()