From 5defa222d6d5aee91ddee0c9b13211a8d2b8b617 Mon Sep 17 00:00:00 2001 From: Ian Gulliver Date: Thu, 4 Aug 2016 04:25:02 +0000 Subject: [PATCH] Xenial tweaks --- server/module_lib/icon_lib.py | 4 +++- server/server.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/server/module_lib/icon_lib.py b/server/module_lib/icon_lib.py index ac23328..7df1271 100644 --- a/server/module_lib/icon_lib.py +++ b/server/module_lib/icon_lib.py @@ -20,8 +20,10 @@ class IconModule(object): def Exec(self, *args, **kwargs): print('+', args) + env = kwargs.pop('env', os.environ.copy()) + env['LC_ALL'] = 'C' try: - subprocess.check_call(args, **kwargs) + subprocess.check_call(args, env=env, **kwargs) except subprocess.CalledProcessError as e: print('ERROR:', e) raise SubprocessFailure(e) diff --git a/server/server.py b/server/server.py index 15eefe9..460684b 100755 --- a/server/server.py +++ b/server/server.py @@ -174,6 +174,7 @@ class INotifyHandler(pyinotify.ProcessEvent): if event.name != 'manifest.json': return image_type = os.path.basename(event.path) + print('New manifest for:', image_type) self._websockets.Broadcast(self._websockets, { 'type': 'new_manifest', 'data': {