Skip to content

Commit

Permalink
some shells (ie: tcsh) don't like seeing more than one pipe redirecti…
Browse files Browse the repository at this point in the history
…on, so let initenv spew out its stuff: it only does so when it fails anyway, and our more informative message will still get printed afterwards

git-svn-id: https://xpra.org/svn/Xpra/trunk@7912 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Oct 8, 2014
1 parent 4eadcd3 commit fe1d03e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/xpra/scripts/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ def connect_to(display_desc, debug_cb=None, ssh_fail_cb=ssh_connect_failed):
if dtype == "ssh":
cmd = display_desc["full_ssh"]
proxy_cmd = display_desc["remote_xpra"] + display_desc["proxy_command"] + display_desc["display_as_args"]
cmd += ["xpra initenv >> /dev/null 2>&1 || echo \"Warning: xpra server does not support initenv\" 1>&2;"+(" ".join(proxy_cmd))]
cmd += ["xpra initenv || echo \"Warning: xpra server does not support initenv\" 1>&2;"+(" ".join(proxy_cmd))]
try:
kwargs = {}
kwargs["stderr"] = sys.stderr
Expand Down

0 comments on commit fe1d03e

Please sign in to comment.