[SCM] live-magic branch, master, updated. 1.11-12-gb8162c7
Chris Lamb
lamby at debian.org
Mon Aug 2 06:12:06 UTC 2010
The following commit has been merged in the master branch:
commit f34e17b0e2b8191523461fe2a87550af97b48f9a
Author: Chris Lamb <lamby at debian.org>
Date: Mon Aug 2 01:27:02 2010 -0400
Pass {true,false} instead of {True,False} to lh config.
diff --git a/DebianLive/__init__.py b/DebianLive/__init__.py
index 69fdedb..1e96f96 100644
--- a/DebianLive/__init__.py
+++ b/DebianLive/__init__.py
@@ -38,11 +38,18 @@ class Config(object):
if not os.path.exists(self.dir):
os.makedirs(self.dir)
- options = ["--%s='%s'" % (k.replace('_', '-'), v)
- for k, v in kwargs.iteritems()]
+ options = []
+
+ for k, v in kwargs.iteritems():
+ if isinstance(v, (bool,)):
+ v = str(v).lower()
+ options.append("--%s='%s'" % (k.replace('_', '-'), v))
+
cmd = 'cd "%s"; lh config --ignore-system-defaults %s' % (os.path.abspath(self.dir),
' '.join(options))
+ print "*", cmd
+
result, out = commands.getstatusoutput(cmd)
if result != 0:
raise IOError, out
diff --git a/debian/changelog b/debian/changelog
index 237ea5e..3805a83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ live-magic (1.12) UNRELEASED; urgency=low
* Update copyright years from 2007-2008 => 2007-2010.
* Update my email address.
* Bump (and rename) dependency on live-build to at least 2.0~a21.
+ * Pass {true,false} instead of {True,False} to lh config.
-- Chris Lamb <lamby at debian.org> Mon, 02 Aug 2010 00:41:11 -0400
--
live-magic
More information about the debian-live-changes
mailing list