fishdescriptor: sort out debugging output

[chiark-utils.git] / fishdescriptor / fishdescriptor

diff --git a/fishdescriptor/fishdescriptor b/fishdescriptor/fishdescriptor
index dc1776207d55e62b99acf91f652bc0d46e452d4a..20eddfef05936e38aa17a0bc29bcd8f8ebe2d58c 100755 (executable)
--- a/fishdescriptor/fishdescriptor
+++ b/fishdescriptor/fishdescriptor
@@ -117,7 +117,7 @@ def implement_exec(argl):
 def set_donor(pid):
     global donor
     if donor is not None: donor.detach()
-    donor = fishdescriptor.fish.Donor(pid)
+    donor = fishdescriptor.fish.Donor(pid, debug=ov.debug)
 
 def ocb_set_donor(option, opt, value, parser):
     set_donor(value)
@@ -139,6 +139,9 @@ def process_args():
     op.disable_interspersed_args()
     op.add_option('-p','--pid', type='int', action='callback',
                   callback=ocb_set_donor)
+    op.add_option('-D','--debug', action='store_const',
+                  dest='debug', const=sys.stderr)
+    ov.debug = None
 
     args = sys.argv[1:]
     last_nominal = None # None or (nominal,) ie None or (None,) or (int,)
@@ -148,10 +151,8 @@ def process_args():
         if not len(args): break
 
         arg = args.pop(0)
-        print("ARG %s" % arg, file=sys.stderr)
 
         if donor is None:
-            print("SET_DONOR", file=sys.stderr)
             set_donor(int(arg))
         elif arg_matches(r'^(?:(\d+)=)?(\d+)?$'):
             (nominal, there) = m.groups()