RepoMirrors
/
autorandr
mirror of https://github.com/phillipberndt/autorandr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve the error message if running a userscript fails (see issue #65)

This commit is contained in:
Phillip Berndt 2016-12-18 10:54:52 +01:00
parent 646cc03f67
commit ff75a031ef
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autorandr.py
View File

@ -767,7 +767,10 @@ def exec_scripts(profile_path, script_name, meta_information=None):
if script_name not in ran_scripts:
script = os.path.join(folder, script_name)
if os.access(script, os.X_OK | os.F_OK):
all_ok &= subprocess.call(script, env=env) != 0
try:
all_ok &= subprocess.call(script, env=env) != 0
except:
raise AutorandrException("Failed to execute user command: %s" % (script,))
ran_scripts.add(script_name)
script_folder = os.path.join(folder, "%s.d" % script_name)
@ -777,7 +780,10 @@ def exec_scripts(profile_path, script_name, meta_information=None):
if check_name not in ran_scripts:
script = os.path.join(script_folder, file_name)
if os.access(script, os.X_OK | os.F_OK):
all_ok &= subprocess.call(script, env=env) != 0
try:
all_ok &= subprocess.call(script, env=env) != 0
except:
raise AutorandrException("Failed to execute user command: %s" % (script,))
ran_scripts.add(check_name)
return all_ok
@ -1042,6 +1048,8 @@ def main(argv):
apply_configuration(load_config, config, True)
apply_configuration(load_config, config, False)
exec_scripts(scripts_path, "postswitch", script_metadata)
except AutorandrException as e:
raise AutorandrException("Failed to apply profile '%s'" % load_profile, e, e.report_bug)
except Exception as e:
raise AutorandrException("Failed to apply profile '%s'" % load_profile, e, True)