Distriction specific patch, not going upstream Disable systemd-run if the command is not found. diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py index 1c5e8ddaad..084aabe792 100755 --- a/xpra/scripts/main.py +++ b/xpra/scripts/main.py @@ -396,23 +396,26 @@ def use_systemd_run(s) -> bool: cmd = ["systemd-run", "--quiet"] if getuid() != 0: cmd += ["--user"] - cmd += ["--scope", "--", "true"] - proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False) try: - proc.communicate(timeout=2) - r = proc.returncode - except TimeoutExpired: # pragma: no cover - r = None - if r is None: - try: - proc.terminate() - except Exception: - pass + cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"] + proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False) try: - proc.communicate(timeout=1) + proc.communicate(timeout=2) + r = proc.returncode except TimeoutExpired: # pragma: no cover r = None - return r == 0 + if r is None: + try: + proc.terminate() + except Exception: + pass + try: + proc.communicate(timeout=1) + except TimeoutExpired: # pragma: no cover + r = None + return r==0 + except FileNotFoundError: + return False def verify_gir(): cac3e9ef1625d54bcdbbbcd7a11dc78040'>diff
path: root/gnu/packages/mold.scm
AgeCommit message (Expand)Author
2024-10-05gnu: mold: Update to 2.34.1....* gnu/packages/mold.scm (mold): Update to 2.34.1. Change-Id: Ia822b9170df33844af88578f040df4c3c0af3b6a Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn> Ashish SHUKLA via Guix-patches via
2024-09-29gnu: mold: Only build with mimalloc on 64-bit systems....* gnu/packages/mold.scm (mold)[arguments]: Adjust the configure-flags to only use mimalloc on 64-bit systems. [inputs]: Only add mimalloc when building for a 64-bit system. Change-Id: I7fc8eed076072ccb49f180adbfb12683ae169eca Efraim Flashner
2024-09-29gnu: mold: Update to 2.34.0....* gnu/packages/mold.scm (mold): Update to 2.34.0. [arguments](phases)<force-system-xxhash>: Update path. <fix-compiler-name-in-test>: Update path. <skip-tbb-lto-test>: Update path. <disable-rpath-test>: Update path. Change-Id: I21e8cdd057fb13b508299a1b0fd9b48f803959bd Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn> Ashish SHUKLA
2024-08-07gnu: mold: Update to 2.33.0....* gnu/packages/mold.scm (mold): Update to 2.33.0. Change-Id: Ic491ffc7e549a06b52f75352fa2f33433ee75f55 Signed-off-by: jgart <jgart@dismail.de> Ashish SHUKLA
2024-06-27gnu: mold: Update to 2.32.1....* gnu/packages/mold.scm (mold): Update to 2.32.1. Change-Id: Iaf5b3b4ba09e19a35f471c08b7b130a4fee4d4fb Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn> Ashish SHUKLA
2024-06-24gnu: mold: Update to 2.32.0...* gnu/packages/mold.scm (mold): Update to 2.32.0. Change-Id: Ia99d57c92e9e9d75d80880376687b8a0b5fde184 Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Ashish SHUKLA