Skip to content

Commit

Permalink
#3229 make external rencode optional
Browse files Browse the repository at this point in the history
  • Loading branch information
@totaam
totaam committed Aug 3, 2021
1 parent 592f27a commit bb867cd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions packaging/debian/xpra/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
,python3-numpy
# for PNG and JPEG support:
,python3-pil
# packet encoder:
,python3-rencode
# packet compression:
,python3-lz4
# clipboard packet compression:
Expand All @@ -65,6 +63,8 @@ Recommends: python3-dbus
,xpra-html5
# for the proxy server:
,python3-setproctitle
# packet encoder:
,python3-rencode
#not available?
,python3-zeroconf
,python3-netifaces
Expand Down
2 changes: 1 addition & 1 deletion packaging/rpm/xpra.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ Requires: xpra-common = %{version}-%{release}
Requires: python3
Requires: python3-lz4
Requires: python3-pillow
Requires: python3-rencode
Requires: python3-numpy
Requires: libyuv
Requires: libvpx
Expand All @@ -157,6 +156,7 @@ Requires: ffmpeg-xpra
Requires: turbojpeg
Requires: python3-cryptography
Requires: python3-gobject
Recommends: python3-rencode
Recommends: python3-inotify
Recommends: python3-netifaces
Recommends: python3-dbus
Expand Down

7 comments on commit bb867cd

@basilgello
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With Xpra trunk built with rencodeplus and python3-rencode removed I can not connect to Xpra server:

2021-08-04 09:36:55,522 Disconnecting client /run/user/1000/xpra/test-1:
2021-08-04 09:36:55,522  invalid packet encoding: rencode decoder is not available

@totaam

@basilgello
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding python3-rencode still does not resolve the inability to connect to server... The Xpra server process chews 100% CPU after connection accepted and hangs...

@totaam
Copy link
Collaborator Author

@totaam totaam commented on bb867cd Aug 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@basilgello wow, that is a weird one.
It works for me before and after removing python3-rencode on Fedora but I am seeing some weird behaviour on Debian.

@basilgello
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have to roll back to 20210713 build bc this one hangs inside rencode.cpython solib... I will spawn a container and reproduce the issue with full debug info...

@totaam
Copy link
Collaborator Author

@totaam totaam commented on bb867cd Aug 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bisecting leads me to 592f27a and not this commit.

@totaam
Copy link
Collaborator Author

@totaam totaam commented on bb867cd Aug 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NVM, I can reproduce on Fedora so I will be able to fix this quickly.
The reason why it continued to work after removing python3-rencode is that I had been playing with fixes to rencode so there was another copy installed... DOH!

@totaam
Copy link
Collaborator Author

@totaam totaam commented on bb867cd Aug 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed: ddccc04

Please sign in to comment.