From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 25 May 2020 15:33:19 +0000 (+0100)
Subject: Merge branch '1.0.0pre19.x'
X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/commitdiff_plain/ab6f1b0d12478b8fe266e3dacc3de7121df29066

Merge branch '1.0.0pre19.x'

* 1.0.0pre19.x:
  svc/connect.in: Squash newlines to spaces in `info' output.
  server/admin.c: Fix `=' vs `==' error in assertion.
  svc/tripe-ifup.in: Don't set remote IPv6 address until interface is up.
---

ab6f1b0d12478b8fe266e3dacc3de7121df29066
diff --cc svc/connect.in
index 99dbd8af,78da3252..268ad5fc
--- a/svc/connect.in
+++ b/svc/connect.in
@@@ -833,16 -753,10 +833,16 @@@ def cmd_info(name)
    """
    try: peer = Peer(name)
    except KeyError: raise T.TripeJobError('unknown-peer', name)
 -  items = list(peer.list())
 +  d = {}
 +  try: pp = pinger.find(name)
 +  except KeyError: pass
 +  else: d.update(pp.info())
 +  items = list(peer.list()) + d.keys()
    items.sort()
    for i in items:
 -    T.svcinfo('%s=%s' % (i, peer.get(i).replace('\n', ' ')))
 +    try: v = d[i]
 +    except KeyError: v = peer.get(i)
-     T.svcinfo('%s=%s' % (i, v))
++    T.svcinfo('%s=%s' % (i, v.replace('\n', ' ')))
  
  def cmd_userpeer(user):
    """