gnu/packages/patches/xpra-4.2-systemd-run.patch

   1 Disable systemd-run if the command is not found.
   2
   3 diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
   4 --- xpra-4.2~/xpra/scripts/main.py      2021-06-06 08:51:13.756815842 -0700
   5 +++ xpra-4.2/xpra/scripts/main.py       2021-06-06 16:07:13.371024486 -0700
   6 @@ -331,23 +331,26 @@
   7      if not is_systemd_pid1():
   8          return False    # pragma: no cover
   9      #test it:
  10 -    cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
  11 -    proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
  12      try:
  13 -        proc.communicate(timeout=2)
  14 -        r = proc.returncode
  15 -    except TimeoutExpired:  # pragma: no cover
  16 -        r = None
  17 -    if r is None:
  18 +        cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
  19 +        proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
  20          try:
  21 -            proc.terminate()
  22 -        except Exception:
  23 -            pass
  24 -        try:
  25 -            proc.communicate(timeout=1)
  26 +            proc.communicate(timeout=2)
  27 +            r = proc.returncode
  28          except TimeoutExpired:  # pragma: no cover
  29              r = None
  30 -    return r==0
  31 +        if r is None:
  32 +            try:
  33 +                proc.terminate()
  34 +            except Exception:
  35 +                pass
  36 +            try:
  37 +                proc.communicate(timeout=1)
  38 +            except TimeoutExpired:  # pragma: no cover
  39 +                r = None
  40 +        return r==0
  41 +    except FileNotFoundError:
  42 +        return False
  43
  44
  45  def run_mode(script_file, error_cb, options, args, mode, defaults):