[SCM] live-magic branch, master, updated. 1.12-6-g161ae2a

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 16bf3bfc9015f306a6bd92ea5b0e5ade0c2209b1
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Sep 25 19:09:18 2010 +0200

    Updating location of live-build conffile from /etc/default/live-helper to /etc/live/build.conf.

diff --git a/DebianLive/utils/sources_list.py b/DebianLive/utils/sources_list.py
index ddc1d37..327802b 100644
--- a/DebianLive/utils/sources_list.py
+++ b/DebianLive/utils/sources_list.py
@@ -35,7 +35,7 @@ REJECT_PATTERNS = (
     re.compile(r'volatile\.'),
 )
 
-def get_mirror(fallback='http://www.us.debian.org/', sources_list='/etc/apt/sources.list', defaults='/etc/default/live-helper'):
+def get_mirror(fallback='http://www.us.debian.org/', sources_list='/etc/apt/sources.list', defaults='/etc/live/build.conf'):
     result = fallback
 
     def filter_mirror(line):
@@ -69,7 +69,7 @@ def get_mirror(fallback='http://www.us.debian.org/', sources_list='/etc/apt/sour
 
     if defaults:
         try:
-            kv = KeyVar('/etc/default', 'live-helper', {}, filename=defaults)
+            kv = KeyVar('/etc/live', 'build.conf', {}, filename=defaults)
             kv_mirror = filter_mirror(kv['LB_MIRROR_BOOTSTRAP'])
             if kv_mirror:
                 return kv_mirror
diff --git a/LiveMagic/views/wizard.py b/LiveMagic/views/wizard.py
index 431fa35..e7321da 100644
--- a/LiveMagic/views/wizard.py
+++ b/LiveMagic/views/wizard.py
@@ -147,7 +147,7 @@ class WizardView(object):
         server = '192.168.1.1'
         path = '/srv/debian-live'
         try:
-            kv = KeyVar('/etc/default', 'live-helper', {}, filename='/etc/default/live-helper')
+            kv = KeyVar('/etc/live', 'build.conf', {}, filename='/etc/live/build.conf')
             server = kv.get('LB_NET_ROOT_SERVER', server)
             path = kv.get('LB_NET_ROOT_PATH', path)
         except IOError:

-- 
live-magic