From f967aa376d583e745a371987414585a359abe25d Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Wed, 17 Jun 2015 15:07:18 +0200
Subject: [PATCH 1/2] Fix TravisCI failure on python 2.4
---
system/osx_defaults.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/system/osx_defaults.py b/system/osx_defaults.py
index 0dd7ca8ff6b..7e2fe38ad77 100644
--- a/system/osx_defaults.py
+++ b/system/osx_defaults.py
@@ -209,7 +209,10 @@ class OSXDefaults(object):
# We need to convert some values so the defaults commandline understands it
if type(self.value) is bool:
- value = "TRUE" if self.value else "FALSE"
+ if self.value:
+ value = "TRUE"
+ else:
+ value = "FALSE"
elif type(self.value) is int or type(self.value) is float:
value = str(self.value)
elif self.array_add and self.current_value is not None:
From 685653b23b9d455507e6fa472de7cd3b8c03ee6c Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Wed, 17 Jun 2015 15:22:10 +0200
Subject: [PATCH 2/2] Another incompatibility with python 2.4
---
system/osx_defaults.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/system/osx_defaults.py b/system/osx_defaults.py
index 7e2fe38ad77..e5d2bc51731 100644
--- a/system/osx_defaults.py
+++ b/system/osx_defaults.py
@@ -343,7 +343,7 @@ def main():
array_add=array_add, value=value, state=state, path=path)
changed = defaults.run()
module.exit_json(changed=changed)
- except OSXDefaultsException as e:
+ except OSXDefaultsException, e:
module.fail_json(msg=e.message)
# /main ------------------------------------------------------------------- }}}