summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimeon Simeonov2015-04-14 15:52:15 +0200
committerSimeon Simeonov2015-04-14 15:52:15 +0200
commit56c09c10fd7dd1cb3a83a8d4b1bdcd98459e8175 (patch)
treea29450c12f044ab475fb136060db0308850f683a
parent4aea82a1aef53c28110cc45c734b835efdc361b3 (diff)
Fix a few bigs in beinc_server_xmlrpc.py
-rwxr-xr-xbeinc_server_xmlrpc.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/beinc_server_xmlrpc.py b/beinc_server_xmlrpc.py
index 39cf422..36cbcd5 100755
--- a/beinc_server_xmlrpc.py
+++ b/beinc_server_xmlrpc.py
@@ -106,7 +106,10 @@ class BEINCInstance(object):
106 '{0} {1}'.format(sys.argv[0], __version__)) 106 '{0} {1}'.format(sys.argv[0], __version__))
107 except Exception as e: 107 except Exception as e:
108 sys.stderr.write( 108 sys.stderr.write(
109 'Unable to set up a notification object for {0} ({1})\n') 109 'Unable to set up a '
110 'pynotify notification object for "{0}" ({1})\n'.format(
111 self.__name,
112 e))
110 sys.exit(errno.EPERM) 113 sys.exit(errno.EPERM)
111 self.__osd_type = BEINC_OSD_TYPE_PYNOTIFY 114 self.__osd_type = BEINC_OSD_TYPE_PYNOTIFY
112 elif instance_dict['osd_system'].lower() == 'pyosd': 115 elif instance_dict['osd_system'].lower() == 'pyosd':
@@ -141,7 +144,10 @@ class BEINCInstance(object):
141 instance_dict.get('pyosd_color', 'blue')) 144 instance_dict.get('pyosd_color', 'blue'))
142 except Exception as e: 145 except Exception as e:
143 sys.stderr.write( 146 sys.stderr.write(
144 'Unable to set up a notification object for {0} ({1})\n') 147 'Unable to set up a pyosd '
148 'notification object for "{0}" ({1})\n'.format(
149 self.__name,
150 e))
145 sys.exit(errno.EPERM) 151 sys.exit(errno.EPERM)
146 self.__osd_type = BEINC_OSD_TYPE_PYOSD 152 self.__osd_type = BEINC_OSD_TYPE_PYOSD
147 153
@@ -342,7 +348,7 @@ def main():
342 e)) 348 e))
343 sys.exit(errno.EIO) 349 sys.exit(errno.EIO)
344 try: 350 try:
345 if config_dict.get(config_version) != 2: 351 if config_dict.get('config_version') != 2:
346 sys.stderr.write( 352 sys.stderr.write(
347 'Incompatible or missing config-file version for {0}\n'.format( 353 'Incompatible or missing config-file version for {0}\n'.format(
348 args.config_file)) 354 args.config_file))