Merge branch 'release/4.4.2'

martin-ueding · Jul 31, 2015 · f6d78df · f6d78df
2 parents 8887915 + 9e0e7fd
commit f6d78df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,13 @@
 Changelog
 #########
 
+v4.4.2
+    Released: 2015-07-31 15:14:59 +0200
+
+    - Fix error in docking. I have broken it by assigning a temporary to a
+      variable ``output`` which also happened to be the function argument.
+      Sorry. I wish I had ``const`` in Python :-/.
+
 v4.4.1
     Released: 2015-07-29 08:23:28 +0200
 

diff --git a/doc/guides/acpi_listen.rst b/doc/guides/acpi_listen.rst
@@ -23,4 +23,5 @@ This then goes into an ACPI hook file like so:
     action=/usr/bin/thinkpad-rotate-hook %e
 
 If you give us the output of ``acpi_listen``, we can try to get the hardware
-event working for you.
+event working for you. The hook in ``tps/hooks.py`` needs to be made aware of
+the hardware keys as well in order to decide which action to take.
diff --git a/tps/screen.py b/tps/screen.py
@@ -179,8 +179,8 @@ def get_resolution_and_shift(output):
     3286×1080 and the position of the internal screen is 1366×768+1920+0. This
     allows to compute the transformation matrix for this.
     '''
-    output = tps.check_output(['xrandr', '-q'], logger).strip().decode()
-    lines = output.split('\n')
+    xrandr_output = tps.check_output(['xrandr', '-q'], logger).strip().decode()
+    lines = xrandr_output.split('\n')
 
     pattern_output = re.compile(r'''
                                 {}