[Checkins] SVN: zc.buildout/trunk/src/zc/buildout/ Added "doing" info when getting distributions.

[Jim Fulton]

Log message for revision 73126:
  Added "doing" info when getting distributions.
  
  Treat DistutilsErrors as user errors.
  

Changed:
  U   zc.buildout/trunk/src/zc/buildout/buildout.py
  U   zc.buildout/trunk/src/zc/buildout/easy_install.py
  U   zc.buildout/trunk/src/zc/buildout/tests.py

-=-
Modified: zc.buildout/trunk/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/buildout.py	2007-03-09 16:40:52 UTC (rev 73125)
+++ zc.buildout/trunk/src/zc/buildout/buildout.py	2007-03-09 16:40:54 UTC (rev 73126)
@@ -16,6 +16,7 @@
 $Id$
 """
 
+import distutils.errors
 import logging
 import md5
 import os
@@ -1181,7 +1182,10 @@
                 sys.stderr.write('\nStarting pdb:\n')
                 pdb.post_mortem(exc_info[2])
             else:
-                if isinstance(v, zc.buildout.UserError):
+                if isinstance(v, (zc.buildout.UserError,
+                                  distutils.errors.DistutilsError,
+                                  )
+                              ):
                     _error(str(v))
                 else:
                     _internal_error(v)

Modified: zc.buildout/trunk/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.py	2007-03-09 16:40:52 UTC (rev 73125)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.py	2007-03-09 16:40:54 UTC (rev 73126)
@@ -249,6 +249,8 @@
 
     def _get_dist(self, requirement, ws, always_unzip):
 
+        __doing__ = 'Getting distribution for %s', requirement
+
         # Maybe an existing dist is already the best dist that satisfies the
         # requirement
         dist = self._satisfied(requirement)

Modified: zc.buildout/trunk/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/tests.py	2007-03-09 16:40:52 UTC (rev 73125)
+++ zc.buildout/trunk/src/zc/buildout/tests.py	2007-03-09 16:40:54 UTC (rev 73126)
@@ -1323,6 +1323,23 @@
     NameError:
     global name 'os' is not defined
     """
+
+def download_errors():
+    """
+    >>> write(sample_buildout, 'buildout.cfg',
+    ... '''
+    ... [buildout]
+    ... parts = 
+    ... find-links = http://127.0.0.1/no-shuch-thing
+    ... ''')
+
+    >>> print system(buildout), # doctest: +ELLIPSIS
+    While:
+      Installing
+      Checking for upgrades
+      Getting distribution for setuptools
+    Error: Download error...
+    """
     
 
 ######################################################################