ownsrc debugging

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/hippotatd b/hippotatd
index a6d31795aa944aa3712fff169e1767261f392750..399dfe710f0c1b333b59afa82bf1cc5d5f1a494b 100755 (executable)
--- a/hippotatd
+++ b/hippotatd
@@ -265,6 +265,7 @@ def start_http():
 
   ssp = SourceShipmentPreparer(td)
   ssp.logger = partial(log_debug, DBG.OWNSOURCE)
+  if DBG.OWNSOURCE in debug_set: ssp.stream_debug = sys.stdout
   ssp.generate()
 
   resource.putChild(b'source',  twisted.web.static.File(ssp.output_paths[0]))

diff --git a/hippotatlib/__init__.py b/hippotatlib/__init__.py
index feb7894430fe4b61898fca1c429ebbc0e9a04f5e..8a26bee283ee38e7a58c7ae37b9b9b27d9792890 100644 (file)
--- a/hippotatlib/__init__.py
+++ b/hippotatlib/__init__.py
@@ -567,7 +567,8 @@ def common_startup(process_cfg):
 
   def ds_default(od,os,dl,op):
     global debug_set
-    debug_set = set(dfs_less_detailed(debug_def_detail))
+    debug_set.clear
+    debug_set |= set(dfs_less_detailed(debug_def_detail))
 
   def ds_select(od,os, spec, op):
     for it in spec.split(','):
@@ -639,7 +640,8 @@ just `+': all DFLAGs.
     print('\nInvalid configuration, giving up.', file=sys.stderr)
     sys.exit(12)
 
-  #print(repr(debug_set), file=sys.stderr)
+
+  #print('X', debug_set, file=sys.stderr)
 
   log_formatter = twisted.logger.formatEventAsClassicLogText
   stdout_obs = twisted.logger.FileLogObserver(sys.stdout, log_formatter)

diff --git a/hippotatlib/ownsource.py b/hippotatlib/ownsource.py
index 8e309798456c7590a84326bc1f4e970f6ea048ca..ac467f0fa2fb048aefab52a60cd74ca7ea994221 100644 (file)
--- a/hippotatlib/ownsource.py
+++ b/hippotatlib/ownsource.py
@@ -57,6 +57,8 @@ class SourceShipmentPreparer():
     s.rune_shell = ['/bin/bash', '-ec']
     s.show_pathnames = True
     s.download_packages = True
+    s.stream_stderr = sys.stderr
+    s.stream_debug = open('/dev/null','w')
     s.rune_cpio = r'''
             set -o pipefail
            (
@@ -274,8 +276,8 @@ class SourceShipmentPreparer():
         subprocess.run(cmdl,
                        cwd=s._packages_path,
                        stdin=subprocess.DEVNULL,
-                       stdout=sys.stdout,
-                       stderr=sys.stderr,
+                       stdout=s.stream_debug,
+                       stderr=s.stream_stderr,
                        restore_signals=True,
                        check=True)
 

diff --git a/srcbombtest.py b/srcbombtest.py
index 25bc3186f81521979d5bb301d583c31a3b42f6e6..f0607ba8ff67973e4c52d2b4d697d8fd4b283189 100755 (executable)
--- a/srcbombtest.py
+++ b/srcbombtest.py
@@ -3,6 +3,8 @@
 from hippotatlib.ownsource import SourceShipmentPreparer
 
 import twisted
+import sys
 
 p = SourceShipmentPreparer('tmp')
+p.stream_debug = sys.stdout
 p.generate()