Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xpra: fix #41106 #87982

Merged
merged 1 commit into from May 20, 2020
Merged

xpra: fix #41106 #87982

merged 1 commit into from May 20, 2020

Conversation

@lourkeur
Copy link
Contributor

lourkeur commented May 16, 2020

Motivation for this change

Fix #41106

Things done

A Python SyntaxError is raised when Xpra attempts to explicitly invoke python on the generated wrapper. To prevent that, we make it bypass the wrapper. The environment variables should still be correct because Xpra makes an effort to preserve the environment.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@lourkeur lourkeur changed the title Fix xpra wrapper issues xpra: fix wrapper issues May 16, 2020
@lourkeur
Copy link
Contributor Author

lourkeur commented May 16, 2020

Looksk like I hit the wrong thing: xpra-wrapped starts by assigning sys.argv[0].

@mjlbach mjlbach mentioned this pull request May 17, 2020
0 of 7 tasks complete
@lourkeur lourkeur force-pushed the lourkeur:fix_41106 branch from f26337e to 4459844 May 17, 2020
@lourkeur
Copy link
Contributor Author

lourkeur commented May 17, 2020

So to test:

  1. start xpra in daemon mode (with the #85694 countermeasure)
$ xpra start --fake-xinerama=no :100
  1. attach
$ xpra attach :100
  1. Check attach output for SyntaxErrors. There should be none iff the patch is applied.
$ tail -f /run/user/1001/xpra/:100.log
@lourkeur lourkeur changed the title xpra: fix wrapper issues xpra: fix #41106 May 17, 2020
@lourkeur lourkeur marked this pull request as ready for review May 17, 2020
@offlinehacker offlinehacker merged commit f7394da into NixOS:master May 20, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4459844"; rev="4459844e799b499893cf3af0e21f84c56c0357ed"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4459844"; rev="4459844e799b499893cf3af0e21f84c56c0357ed"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4459844"; rev="4459844e799b499893cf3af0e21f84c56c0357ed"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4459844"; rev="4459844e799b499893cf3af0e21f84c56c0357ed"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4459844"; rev="4459844e799b499893cf3af0e21f84c56c0357ed"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4459844"; rev="4459844e799b499893cf3af0e21f84c56c0357ed"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4459844"; rev="4459844e799b499893cf3af0e21f84c56c0357ed"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
xpra, xpra.passthru.tests on aarch64-linux Success
Details
xpra, xpra.passthru.tests on x86_64-linux Success
Details
@lourkeur lourkeur mentioned this pull request May 22, 2020
3 of 10 tasks complete
@lourkeur lourkeur deleted the lourkeur:fix_41106 branch Jun 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants
You can’t perform that action at this time.