From 99c98ce632d0376c98d722e8c1ad2832486783ea Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Aug 2013 15:28:33 +0200 Subject: [PATCH] service.openelec.settings: update upstream patch Signed-off-by: Stephan Raue --- .../service.openelec.settings-folders.patch | 54 ++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch b/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch index 247d2ec510..0befb3a182 100644 --- a/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch +++ b/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch @@ -1,7 +1,7 @@ From b0f33807f0dadf11d1b007204607d98d9f17d8f7 Mon Sep 17 00:00:00 2001 From: lufi Date: Sun, 18 Aug 2013 22:16:45 +0200 -Subject: [PATCH 1/2] Update defaults.py +Subject: [PATCH 1/3] Update defaults.py --- defaults.py | 16 ++++++++-------- @@ -39,7 +39,7 @@ index 7a582de..16e78e8 100755 From 26d02eb4b2ca01e975a4c0b4c8a91a8010147cbf Mon Sep 17 00:00:00 2001 From: lufi Date: Sun, 18 Aug 2013 22:21:28 +0200 -Subject: [PATCH 2/2] change old service config files to .cache/services/ dir +Subject: [PATCH 2/3] change old service config files to .cache/services/ dir --- oe.py | 4 ++-- @@ -70,3 +70,53 @@ index 7df2ba2..d3db4b4 100755 -- 1.8.1.6 + +From adfcc15ae01cecc78a63613d2b46f08b8e7f6713 Mon Sep 17 00:00:00 2001 +From: lufi +Date: Mon, 19 Aug 2013 13:34:13 +0200 +Subject: [PATCH 3/3] Update services.py + +--- + resources/lib/modules/services.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/resources/lib/modules/services.py b/resources/lib/modules/services.py +index 9ec987b..d4d96a6 100755 +--- a/resources/lib/modules/services.py ++++ b/resources/lib/modules/services.py +@@ -399,12 +399,12 @@ def load_values(self): + self.struct['bluez']['settings']['enabled']['value'] = '0' + + if os.path.isfile(self.oe.dictModules['bluetooth'].OBEX_DAEMON): +- if self.oe.get_service_option('bluez', 'OBEXD_ENABLED', 'true') == 'true': ++ if self.oe.get_service_option('obexd', 'OBEXD_ENABLED', 'true') == 'true': + self.struct['bluez']['settings']['obex_enabled']['value'] = '1' + else: + self.struct['bluez']['settings']['obex_enabled']['value'] = '0' + +- tmpVal = self.oe.get_service_option('bluez', 'OBEXD_ROOT', ++ tmpVal = self.oe.get_service_option('obexd', 'OBEXD_ROOT', + self.oe.dictModules['bluetooth'].D_OBEXD_ROOT) + if not tmpVal is None: + self.struct['bluez']['settings']['obex_root']['value'] = tmpVal +@@ -946,14 +946,14 @@ def init_bluetooth(self, **kwargs): + if not self.oe.SYSTEMD: + if self.struct['bluez']['settings']['obex_enabled']['value'] == '0': + +- self.oe.set_service_option('bluez', ++ self.oe.set_service_option('obexd', + 'OBEXD_ENABLED', + 'false') + else: +- self.oe.set_service_option('bluez', ++ self.oe.set_service_option('obexd', + 'OBEXD_ENABLED', + 'true') +- self.oe.set_service_option('bluez', ++ self.oe.set_service_option('obexd', + 'OBEXD_ROOT', + self.struct['bluez']['settings' + ]['obex_root']['value']) +-- +1.8.1.6 +