munet: remove bad idea of shortening of logged cmd output

After a good deal of experience triaging issues with software that uses munet,
it has become clear that truncating the debug level stdout and stderr values for
cmd_status() in logging is a real nuisance and not worth the attempted tidiness.

Signed-off-by: Christian Hopps <chopps@labn.net>

Author: choppsv1

munet/base.py

@@ -139,11 +139,25 @@ def shorten(s):
     return s
 
 
-def comm_result(rc, o, e):
-    s = f"\n\treturncode {rc}" if rc else ""
-    o = "\n\tstdout: " + shorten(o) if o and o.strip() else ""
-    e = "\n\tstderr: " + shorten(e) if e and e.strip() else ""
-    return s + o + e
+def block_quote(s):
+    ss = s.strip()
+    if "\n" not in ss:
+        return " " + s.rstrip()
+    s = "\n\t" + s.replace("\n", "\n\t")
+    if s.endswith("\n\t"):
+        s = s[:-2]
+    else:
+        s += "<EOF-NO-NEWLINE>"
+    return s
+
+
+def comm_result(o, e):
+    o = "  stdout: " + block_quote(o) if o and o.strip() else ""
+    e = "  stderr: " + block_quote(e) if e and e.strip() else ""
+    if o and e:
+        return o + "\n" + e
+    else:
+        return o + e
 
 
 def proc_str(p):
@@ -1078,8 +1092,7 @@ def _cmd_status_finish(self, p, c, ac, o, e, raises, warn):
         rc = p.returncode
         self.last = (rc, ac, c, o, e)
         if not rc:
-            resstr = comm_result(rc, o, e)
-            if resstr:
+            if resstr := comm_result(o, e):
                 self.logger.debug("%s", resstr)
         else:
             if warn:

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "munet"
-version = "0.17.1"
+version = "0.17.2"
 description = "A package to facilitate network simulations"
 readme = {file = "README.org", content-type = "text/plain"}
 requires-python = ">=3.9"