Merge branch 'release/4.7.5'

CHANGELOG.rst

@@ -1,9 +1,15 @@
-.. Copyright © 2012-2016 Martin Ueding <dev@martin-ueding.de>
+.. Copyright © 2012-2017 Martin Ueding <dev@martin-ueding.de>
 
 #########
 Changelog
 #########
 
+v4.7.5
+    Released: 2017-01-14 20:40:37 +0100
+
+    - The program now does not crash in the case that the network connection
+      could not be restarted. Instead, a warning is logged (GH-121).
+
 v4.7.4
     Released: 2016-07-13 10:35:07 +0200
 

tps/dock.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
-# Copyright © 2014-2015 Martin Ueding <dev@martin-ueding.de>
+# Copyright © 2014-2016 Martin Ueding <dev@martin-ueding.de>
 # Copyright © 2015 Jim Turner <jturner314@gmail.com>
 # Licensed under The GNU Public License Version 2 (or later)
 
@@ -122,7 +122,8 @@ def dock(on, config):
             tps.screen.set_brightness(config['screen']['brightness'])
 
         primary, secondary, others = select_docking_screens(
-            config['screen']['internal'], config['screen']['primary'],
+            config['screen']['internal'],
+            config['screen']['primary'],
             config['screen']['secondary'])
 
         logger.debug('primary: %s, secondary: %s, others: %s', str(primary),
@@ -164,6 +165,8 @@ def dock(on, config):
                 tps.network.restart(connection_to_restart)
             except tps.network.MissingEthernetException:
                 logger.warning('unable to find ethernet connection')
+            except subprocess.CalledProcessError:
+                logger.warning('unable to restart ethernet connection')
 
         if primary == config['screen']['internal'] or \
            secondary == config['screen']['internal']: