X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr.py;h=41e27b6962ae7dc2a86bf9cd6869e822923aa5dd;hb=7f722b738c80ce38491a43bc8fb5e91bb586e005;hp=812329ddf72e78d8dd01bc158fa37cc74ed1cdc1;hpb=9d4f09ed4f66a25d2f580f60ad4fda024e573b71;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr.py b/autorandr.py index 812329d..41e27b6 100755 --- a/autorandr.py +++ b/autorandr.py @@ -23,7 +23,6 @@ # from __future__ import print_function -import time import binascii import copy @@ -35,6 +34,7 @@ import re import subprocess import sys import shutil +import time from collections import OrderedDict from distutils.version import LooseVersion as Version @@ -113,7 +113,8 @@ class AutorandrException(Exception): retval.append(":\n ") retval.append(str(self.original_exception).replace("\n", "\n ")) if self.report_bug: - retval.append("\nThis appears to be a bug. Please help improving autorandr by reporting it upstream." + retval.append("\nThis appears to be a bug. Please help improving autorandr by reporting it upstream:" + "\nhttps://github.com/phillipberndt/autorandr/issues" "\nPlease attach the output of `xrandr --verbose` to your bug report if appropriate.") return "".join(retval) @@ -735,7 +736,7 @@ def exec_scripts(profile_path, script_name, meta_information=None): user_profile_path = os.path.join(os.environ.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config")), "autorandr") for folder in chain((profile_path, os.path.dirname(profile_path), user_profile_path), - (os.path.join(x, "autorandr") for x in os.environ.get("XDG_CONFIG_DIRS", "").split(":"))): + (os.path.join(x, "autorandr") for x in os.environ.get("XDG_CONFIG_DIRS", "/etc/xdg").split(":"))): if script_name not in ran_scripts: script = os.path.join(folder, script_name) @@ -768,7 +769,7 @@ def main(argv): try: # Load profiles from each XDG config directory # The XDG spec says that earlier entries should take precedence, so reverse the order - for directory in reversed(os.environ.get("XDG_CONFIG_DIRS", "").split(":")): + for directory in reversed(os.environ.get("XDG_CONFIG_DIRS", "/etc/xdg").split(":")): system_profile_path = os.path.join(directory, "autorandr") if os.path.isdir(system_profile_path): profiles.update(load_profiles(system_profile_path)) @@ -945,5 +946,5 @@ if __name__ == '__main__': print("Exception: {0}".format(e.__class__.__name__)) sys.exit(2) - print("Unhandled exception ({0}). Please report this as a bug.".format(e), file=sys.stderr) + print("Unhandled exception ({0}). Please report this as a bug at https://github.com/phillipberndt/autorandr/issues.".format(e), file=sys.stderr) raise