xpra icon
Bug tracker and wiki

This bug tracker and wiki are being discontinued
please use https://github.com/Xpra-org/xpra instead.


Changes between Initial Version and Version 1 of Ticket #2693


Ignore:
Timestamp:
04/01/20 04:11:20 (15 months ago)
Author:
Antoine Martin
Comment:

The culprit is in server/server_util.py, lines 86-96, where the shell code snippet is not left justified.

Thanks for the report. That's exactly it. I had tested it with python3, then added the if-else which changed indentation... trunk doesn't need python2 support, so it doesn't have if-else, or the indentation problem.

Lesson of the day: never apply last minute fixes to a stable branch.. r25876 broke this, r25888 fixes it.

Updated builds are on the way..

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #2693

    • Property Status changed from new to closed
    • Property Resolution changed from to fixed
  • Ticket #2693 – Description

    initial v1  
    1 The generated script, /run/user/$UID/xpra/run-xpra, incorrectly inserts spaces before the END heredoc marker, causing the remainder of the script to be assigned to the heredoc, resulting a syntax error and a client connection failure.
     1The generated script, `/run/user/$UID/xpra/run-xpra`, incorrectly inserts spaces before the END heredoc marker, causing the remainder of the script to be assigned to the heredoc, resulting a syntax error and a client connection failure.
    22{{{
    33% tail -17 /run/user/$UID/xpra/run-xpra
     
    4646
    4747It looks like it's correct in trunk,
    48 https://www.xpra.org/trac/browser/xpra/trunk/src/xpra/server/server_util.py#L106
     48[/browser/xpra/trunk/src/xpra/server/server_util.py#L106]
    4949
    50  but not in 3.0.x?
    51 https://www.xpra.org/trac/browser/xpra/tags/v3.0.x/src/xpra/server/server_util.py#L86
     50but not in 3.0.x?
     51[/browser/xpra/tags/v3.0.x/src/xpra/server/server_util.py#L86]
    5252
    5353