r2772 - in dists/trunk/live-magic: debian livemagic/model

[lamby-guest at alioth.debian.org]

Author: lamby-guest
Date: 2007-08-16 20:04:18 +0000 (Thu, 16 Aug 2007)
New Revision: 2772

Modified:
   dists/trunk/live-magic/debian/control
   dists/trunk/live-magic/livemagic/model/live_helper_configuration.py
Log:
Removes mangling of LH_ROOT/LIVE_ROOT, fixes some builtin shadowing, removes some old testing code, adds live-helper to build-dependencies (tests are run in debian/rules)


Modified: dists/trunk/live-magic/debian/control
===================================================================
--- dists/trunk/live-magic/debian/control	2007-08-16 19:34:47 UTC (rev 2771)
+++ dists/trunk/live-magic/debian/control	2007-08-16 20:04:18 UTC (rev 2772)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Live <debian-live-maint at lists.alioth.debian.org>
 Uploaders: Chris Lamb <chris at chris-lamb.co.uk>, Daniel Baumann <daniel at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, python-dev, python-support, python-yaml
+Build-Depends: debhelper (>= 5), cdbs, python-dev, python-support, python-yaml, live-helper
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/debian-live/dists/trunk/live-magic/
 XS-VCS-Browser: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-magic/

Modified: dists/trunk/live-magic/livemagic/model/live_helper_configuration.py
===================================================================
--- dists/trunk/live-magic/livemagic/model/live_helper_configuration.py	2007-08-16 19:34:47 UTC (rev 2771)
+++ dists/trunk/live-magic/livemagic/model/live_helper_configuration.py	2007-08-16 20:04:18 UTC (rev 2772)
@@ -12,14 +12,14 @@
     Represents a configuration for a Debian Live system.
     """
 
-    def __init__(self, dir=None):
+    def __init__(self, confdir=None):
         self._load_observers = []
         self.first_load = True
 
         yaml_filename = join(dirname(__file__), 'spec.yaml')
         self.spec = yaml.load(file(yaml_filename).read())
 
-        if dir is None:
+        if confdir is None:
             self.new()
         else:
             self.open(dir)
@@ -29,7 +29,7 @@
         Creates and initialises a new configuration in a temporary folder.
         """
         self.dir = tempfile.mkdtemp('live-guihelper')
-        res, out = commands.getstatusoutput('LIVE_ROOT="%s" lh_config' % self.dir)
+        res, out = commands.getstatusoutput('cd %s; lh_config' % self.dir)
         if res != 0: raise IOError, out
         self._load()
 
@@ -88,10 +88,3 @@
 
     def attach_load_observer(self, fn):
         self._load_observers.append(fn)
-
-
-if __name__ == "__main__":
-    k = LiveHelperConfiguration("""/home/lamby/temp/1/debian-live""")
-    print k.chroot.LIVE_LINUX_PACKAGES
-    k.chroot.LIVE_LINUX_PACKAGES.extend(['foobar', 'dfd'])
-    k.save()