Commits

Larry Gilbert committed f7f6e6d

Refresh to catch up to r427

  • Participants
  • Parent commits 0a0249c

Comments (0)

Files changed (1)

-diff -r 07fe766c9f45 distribute_setup.py
---- a/distribute_setup.py	Tue Sep 22 11:36:20 2009 -0700
-+++ b/distribute_setup.py	Tue Sep 22 11:46:23 2009 -0700
-@@ -198,7 +198,7 @@
+diff -r 3eb7eca9042a distribute_setup.py
+--- a/distribute_setup.py	Tue Sep 22 17:41:21 2009 -0700
++++ b/distribute_setup.py	Tue Sep 22 17:43:48 2009 -0700
+@@ -194,7 +194,7 @@
  
  def _rename_path(path):
      new_name = path + '.OLD.%s' % time.time()
--    log.warn('Renaming %s into %s' % (path, new_name))
-+    log.warn('Renaming %s to %s' % (path, new_name))
+-    log.warn('Renaming %s into %s', path, new_name)
++    log.warn('Renaming %s to %s', path, new_name)
      try:
          from setuptools.sandbox import DirectorySandbox
          def _violation(*args):
-@@ -212,7 +212,7 @@
+@@ -209,7 +209,7 @@
  
  def _remove_flat_installation(placeholder):
      if not os.path.isdir(placeholder):
--        log.warn('Unkown installation at %s' % placeholder)
-+        log.warn('Unknown installation at %s' % placeholder)
+-        log.warn('Unkown installation at %s', placeholder)
++        log.warn('Unknown installation at %s', placeholder)
          return False
      found = False
      for file in os.listdir(placeholder):
-@@ -318,7 +318,7 @@
+@@ -320,7 +320,7 @@
      ws = pkg_resources.working_set
      setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
      if setuptools_dist is None:
          return
      # detecting if it was already faked
      setuptools_location = setuptools_dist.location
-diff -r 07fe766c9f45 setuptools/depends.py
---- a/setuptools/depends.py	Tue Sep 22 11:36:20 2009 -0700
-+++ b/setuptools/depends.py	Tue Sep 22 11:46:23 2009 -0700
+diff -r 3eb7eca9042a setuptools/depends.py
+--- a/setuptools/depends.py	Tue Sep 22 17:41:21 2009 -0700
++++ b/setuptools/depends.py	Tue Sep 22 17:43:48 2009 -0700
 @@ -27,7 +27,7 @@
  
  
          if self.requested_version is not None:
              return '%s-%s' % (self.name,self.requested_version)
          return self.name
-diff -r 07fe766c9f45 setuptools/dist.py
---- a/setuptools/dist.py	Tue Sep 22 11:36:20 2009 -0700
-+++ b/setuptools/dist.py	Tue Sep 22 11:46:23 2009 -0700
+diff -r 3eb7eca9042a setuptools/dist.py
+--- a/setuptools/dist.py	Tue Sep 22 17:41:21 2009 -0700
++++ b/setuptools/dist.py	Tue Sep 22 17:43:48 2009 -0700
 @@ -61,7 +61,7 @@
              parent = '.'.join(nsp.split('.')[:-1])
              if parent not in value:
          contain dashes rather than underscores.  If the option doesn't take
          an argument (e.g. '--quiet'), the 'val' is 'None'.
  
-diff -r 07fe766c9f45 virtual-python.py
---- a/virtual-python.py	Tue Sep 22 11:36:20 2009 -0700
-+++ b/virtual-python.py	Tue Sep 22 11:46:23 2009 -0700
+diff -r 3eb7eca9042a virtual-python.py
+--- a/virtual-python.py	Tue Sep 22 17:41:21 2009 -0700
++++ b/virtual-python.py	Tue Sep 22 17:43:48 2009 -0700
 @@ -41,7 +41,7 @@
  
  def main():