From 2289606cab6f70bd1e9808cfb91cc55a2bd1eaf5 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 7 Jul 2020 15:44:42 +0200 Subject: [PATCH] Do not fail if /etc/X11/xorg.conf already exists The file() builtin function was removed in Python 3, see https://docs.python.org/release/3.0/whatsnew/3.0.html#builtins Fixes: | NameError: name 'file' is not defined --- grml-x | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/grml-x b/grml-x index 7323991..49d3f8e 100755 --- a/grml-x +++ b/grml-x @@ -108,14 +108,14 @@ def which(program): return None -XORG_CONF_HEADER = "# Automatically generated by grml-x." +XORG_CONF_HEADER = "# Automatically generated by grml-x.\n" def check_old_xorg_conf(filename, overwrite): # True: no problem, we can create/overwrite the config file # False: pre-existing config file, and we are not to overwrite it if overwrite: return True if not os.path.exists(filename): return True try: - f = file(filename, 'r') + f = open(filename, 'r') lines = f.readlines() f.close() return (not XORG_CONF_HEADER in lines) @@ -205,7 +205,7 @@ def main(): if monitor or device or len(screen.data) > 0 or screen.subsect != '': try: f = tempfile.NamedTemporaryFile(mode='w+', delete=False) - f.write(XORG_CONF_HEADER + "\n") + f.write(XORG_CONF_HEADER) f.write("# DO NOT MODIFY, YOUR CHANGES WILL BE LOST - OR REMOVE ALL HEADER LINES\n") f.write("# See man xorg.conf or /etc/X11/xorg.conf.example for more\n") if monitor: f.write(str(monitor)) -- 2.1.4