davidbuxton / watchedinstall / changeset / d97aaae628c3

Up to file-list watchedinstall.py:

 """A tool for creating transcripts by noting changes made by an installer.
 """
 from __future__ import with_statement
-from contextlib import contextmanager
+from contextlib import contextmanager, nested
 from optparse import OptionParser, OptionValueError
 from cStringIO import StringIO
 from subprocess import CalledProcessError
@@ -314,11 +314,14 @@ def watch_install_events(waitfor):
     """Returns a triple of installer process ID, a list of process IDs and a
     list of filesystem changes that happened while waiting for waitfor to return.
     """
-    # This works around a problem where data was being dropped when using a PIPE
+    # This works around a problem where data was being dropped when using a PIPE
     # and dtrace hanging after being sent SIGTERM which I guess is to do with
     # pipes blocking and creating a race condition.
     fs_events = tempfile.mkstemp()[1]
     pid_events = tempfile.mkstemp()[1]
     with open(fs_events, 'wb') as fs_handle:
         with read_program(EXECSNOOP_ARGS) as pid_events:
     with nested(open(fs_events, 'wb'), open(pid_events, 'wb')) as (fs_handle, pid_handle):
         with read_program(EXECSNOOP_ARGS, stdout=pid_handle):
             with read_program([FSWATCHER_CMD], stdout=fs_handle):
                 # Wait for event logging processes to spin up
                 sleep(1)
@@ -327,6 +330,7 @@ def watch_install_events(waitfor):
     # Return an iterable object
     fs_events = open(fs_events, 'r')
     pid_events = open(pid_events, 'r')
     return installer_pid, pid_events, fs_events

commit 32:	d97aaae628c3
parent 31:	74db22235f00
branch:	default