Don't make unknown xrandr lines a fatal error - my xrandr shows strange stuff when...

[lilass.git] / dsl.py

diff --git a/dsl.py b/dsl.py
index fa7750a55fc355213f3629e77ae0a85be0265025..e1a945e5208454ac58deb0dfd083ce64f94f6fb1 100755 (executable)
--- a/dsl.py
+++ b/dsl.py
@@ -70,7 +70,9 @@ def getXrandrInformation():
                        connectors[connector].append((int(m.groups()[0]), int(m.groups()[1])))
                        continue
                # unknown line
-               raise Exception("Unknown line in xrandr output:\n"+line)
+               # not fatal as my xrandr shows strange stuff when a display is enabled, but not connected
+               #raise Exception("Unknown line in xrandr output:\n"+line)
+               print "Warning: Unknown xrandr line %s" % line
        # be sure to always proprly finish up with the xrandr
        p.communicate()
        # if everything succeededso far, check return code
@@ -121,7 +123,9 @@ def main():
                externalConnectors = config['externalConnectors']
                for connector in externalConnectors:
                        if not connector in connectors:
-                               raise Exception("Connector %s does not exist, there is an error in your config file." % internalConnector)
+                               raise Exception("Connector %s does not exist, there is an error in your config file." % connector)
+                       if connector == internalConnector:
+                               raise Exception("%s is both internal and external, that doesn't make sense." % connector)
        else:
                externalConnectors = connectors.keys()
                externalConnectors.remove(internalConnector)