Changeset 1085 in tailor

Timestamp:

04/01/06 18:37:47 (7 years ago)

Author:

lele@…

Hash name:

20060401163747-97f81-9744ea203e2d66f7c66e7325817e2782763ebe9c

Message:

Check for working directory existence, to avoid confusing error message

File:

• vcpx/shwrap.py (modified) (3 diffs)

vcpx/shwrap.py

@@ -179 +179 @@
         from locale import getpreferredencoding
         from os import environ, getcwd
+        from os.path import isdir
         from cStringIO import StringIO
+        from errno import ENOENT
 
         self.exit_status = None
@@ -194 +196 @@
             return
 
-        if not kwargs.has_key('cwd') and self.cwd:
-            kwargs['cwd'] = self.cwd
-
-        self.log.debug("Executing %r (%r)", self, kwargs.get('cwd', getcwd()))
+        cwd = kwargs.setdefault('cwd', self.cwd or getcwd())
+        if not isdir(cwd):
+            raise OSError(ENOENT, "Working directory does not exist", cwd)
+
+        self.log.debug("Executing %r (%r)", self, cwd)
 
         if not kwargs.has_key('env'):
@@ -233 +236 @@
                             stderr=error,
                             env=kwargs.get('env'),
-                            cwd=kwargs.get('cwd'),
+                            cwd=cwd,
                             universal_newlines=True)
         except OSError, e:
-            from errno import ENOENT
-
             if e.errno == ENOENT:
-                raise OSError("'%s' does not exist!" % self._last_command[0])
+                raise OSError("%r does not exist!" % self._last_command[0])
             else:
                 raise