[SCM] GUI front-end for Debian Live. branch, master, updated. d6ae12437ff380db2b87363283adc42142dc4637

[Chris Lamb]

The following commit has been merged in the master branch:
commit a818a2bf1916c77d694244b806f39eed5b4bfadd
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Apr 11 01:04:33 2008 +0100

    DebianLive/__init__.py: run lh_config in all situations
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/DebianLive/__init__.py b/DebianLive/__init__.py
index a026287..df40c83 100644
--- a/DebianLive/__init__.py
+++ b/DebianLive/__init__.py
@@ -17,23 +17,17 @@ class Config(object):
             if option not in constructor_args:
                 raise TypeError, 'Unexpected keyword argument "%s"' % option
 
-        # Create skeleton lh_config dir, if it does not already exist
-        if os.path.exists(os.path.join(self.dir, 'config')):
-            if len(kwargs) > 0:
-                raise TypeError, \
-                    'Passing keyword arguments when config/ dir already exists'
-        else:
-            if not os.path.exists(self.dir):
-                os.makedirs(self.dir)
-
-            options = ["--%s='%s'" % (k.replace('_', '-'), v)
-                for k, v in kwargs.iteritems()]
-            cmd = 'cd "%s"; lh_config %s' % (os.path.abspath(self.dir),
-                ' '.join(options))
-
-            result, out = commands.getstatusoutput(cmd)
-            if result != 0:
-                raise IOError, out
+        if not os.path.exists(self.dir):
+            os.makedirs(self.dir)
+
+        options = ["--%s='%s'" % (k.replace('_', '-'), v)
+            for k, v in kwargs.iteritems()]
+        cmd = 'cd "%s"; lh_config %s' % (os.path.abspath(self.dir),
+            ' '.join(options))
+
+        result, out = commands.getstatusoutput(cmd)
+        if result != 0:
+            raise IOError, out
 
         self.children = {}
         for name, details in spec.iteritems():

-- 
GUI front-end for Debian Live.