]> git.donarmstrong.com Git - deb_pkgs/autorandr.git/commitdiff
Merge pull request #92 from blueyed/dispatch_call_to_sessions-env
authorPhillip Berndt <phillip.berndt@googlemail.com>
Tue, 21 Nov 2017 15:15:06 +0000 (16:15 +0100)
committerGitHub <noreply@github.com>
Tue, 21 Nov 2017 15:15:06 +0000 (16:15 +0100)
dispatch_call_to_sessions: skip envs without name

1  2 
autorandr.py

diff --combined autorandr.py
index f0cf4ac78f13b604ab3e08a94a1f954b1fdd8c2c,abf11980ca36be22b9ece76b64d569559120ede8..ba6c5f0fcd708f3842545c793869204576399be9
@@@ -865,11 -865,12 +865,11 @@@ def exec_scripts(profile_path, script_n
  
      candidate_directories = [user_profile_path]
      for config_dir in os.environ.get("XDG_CONFIG_DIRS", "/etc/xdg").split(":"):
 -        candidate_directories += os.path.join(config_dir, "autorandr")
 +        candidate_directories.append(os.path.join(config_dir, "autorandr"))
      if profile_path:
 -        candidate_directories += profile_path
 +        candidate_directories.append(profile_path)
  
      for folder in candidate_directories:
 -
          if script_name not in ran_scripts:
              script = os.path.join(folder, script_name)
              if os.access(script, os.X_OK | os.F_OK):
@@@ -956,8 -957,8 +956,8 @@@ def dispatch_call_to_sessions(argv)
  
          process_environ = {}
          for environ_entry in open(environ_file).read().split("\0"):
-             if "=" in environ_entry:
-                 name, value = environ_entry.split("=", 1)
+             name, sep, value = environ_entry.partition("=")
+             if name and sep:
                  if name == "DISPLAY" and "." in value:
                      value = value[:value.find(".")]
                  process_environ[name] = value