Changeset 1243 in tailor

Timestamp:

08/16/06 00:22:03 (7 years ago)

Author:

lele@…

Hash name:

20060815222203-97f81-504b28f38fc35328ead5ffe73a0bc2e945e200c3

Message:

Option to disable the logging facility, for test purposes

File:

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

vcpx/shwrap.py

@@ -53 +53 @@
     """Don't execute commands longer than this number of characters."""
 
-    def __init__(self, command=None, cwd=None):
+    def __init__(self, command=None, cwd=None, nolog=False):
         """
         Initialize a ExternalCommand instance, specifying the command
@@ -75 +75 @@
         """Last executed command."""
 
-        self.log = getLogger('tailor.shell')
+        if nolog:
+            self.log = False
+        else:
+            self.log = getLogger('tailor.shell')
 
     def __str__(self):
@@ -191 +194 @@
             self._last_command.extend(args)
 
-        self.log.info(self)
+        if self.log: self.log.info(self)
 
         if self.DRY_RUN:
@@ -200 +203 @@
             raise OSError(ENOENT, "Working directory does not exist", cwd)
 
-        self.log.debug("Executing %r (%r)", self, cwd)
+        if self.log: self.log.debug("Executing %r (%r)", self, cwd)
 
         if not kwargs.has_key('env'):
@@ -246 +249 @@
         if input and isinstance(input, unicode):
             encoding = getpreferredencoding()
-            self.log.warning("Using default %s encoding, ignoring errors; "
-                             "caller should use repository's encoding and "
-                             "pass an already encoded input" % encoding)
+            if self.log:
+                self.log.warning("Using default %s encoding, ignoring errors; "
+                                 "caller should use repository's encoding and "
+                                 "pass an already encoded input" % encoding)
             input = input.encode(encoding, 'ignore')
 
@@ -255 +259 @@
         self.exit_status = process.returncode
         if not self.exit_status:
-            self.log.info("[Ok]")
-        else:
-            self.log.warning("[Status %s]", self.exit_status)
+            if self.log: self.log.info("[Ok]")
+        else:
+            if self.log: self.log.warning("[Status %s]", self.exit_status)
 
         # For debug purposes, copy the output to our stderr when hidden above