X-Git-Url: http://git.grml.org/?p=grml-x.git;a=blobdiff_plain;f=grml-x;fp=grml-x;h=d8b9c8b112fc236716b2d34262043e2b5b85eae9;hp=2aefadc2a0ef832aacdb3f84feb82826f9803a68;hb=ac9f682344c9065c7e6259020c616166785263de;hpb=af8390f0f9cbd43cdadfa9e274f71edc18ad525a

diff --git a/grml-x b/grml-x
index 2aefadc..d8b9c8b 100755
--- a/grml-x
+++ b/grml-x
@@ -9,7 +9,6 @@
 # License:       This file is licensed under the GPL v2.
 ###############################################################################
 
-import fileinput
 import os
 import subprocess
 import sys
@@ -75,7 +74,7 @@ def build_bootparams():
                     f = open(os.path.join(root, name))
                     lines.extend(f.readlines())
                     f.close()
-        except:
+        except Exception:
             print("W: Error while getting bootparams from %s" % p)
 
     f = open("/proc/cmdline")
@@ -144,7 +143,7 @@ def check_old_xorg_conf(filename, overwrite):
         f = open(filename, "r")
         lines = f.readlines()
         f.close()
-        return not XORG_CONF_HEADER in lines
+        return XORG_CONF_HEADER not in lines
     except IOError:
         return False