[Parti-discuss] breakage

[Antoine Martin]

On a related note, I've added some timeouts to the connects:
http://xpra.devloop.org.uk/patches/v0.0.8pre/socket-timeout.patch

The values may need adjusting but if the local socket is not answering
within 5 seconds, chances are it never will.


Antoine Martin wrote:
> Hi Nathaniel,
> 
> I've got the latest upstream code and there is something broken:
> xpra stop :62
> Traceback (most recent call last):
>   File "/usr/bin/xpra", line 6, in <module>
>     xpra.scripts.main.main(__file__, sys.argv)
>   File "/usr/lib/python2.6/xpra/scripts/main.py", line 110, in main
>     run_stop(parser, options, args)
>   File "/usr/lib/python2.6/xpra/scripts/main.py", line 231, in run_stop
>     final_state = sockdir.server_state(display_name)
> NameError: global name 'display_name' is not defined
> 
> display_name isn't defined anywhere in this method...
> Here's the fix:
> 
> --- a/xpra/scripts/main.py	2009-11-10 23:03:48.000000000 +0700
> +++ b/xpra/scripts/main.py	2009-11-11 00:51:57.000000000 +0700
> @@ -226,8 +226,9 @@
>      while sock.recv(4096):
>          pass
>      if display_desc["local"]:
> +        display_name = display_desc["display"]
>          sockdir = DotXpra()
> -        for i in xrange(6):
> +        for _ in xrange(6):
>              final_state = sockdir.server_state(display_name)
>              if final_state is DotXpra.LIVE:
>                  time.sleep(0.5)
> 
> 
> Cheers
> Antoine
> 
> _______________________________________________
> Parti-discuss mailing list
> Parti-discuss at partiwm.org
> http://lists.partiwm.org/cgi-bin/mailman/listinfo/parti-discuss