[SCM] live-studio branch, master, updated. 472965bca41526efba659461654101170ed81907

[Chris Lamb]

The following commit has been merged in the master branch:
commit 98292a6b6f11d6c0d13bedb478d600e2f2e601f7
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 1 15:59:14 2010 -0400

    Fix names of {kde,gnome}-desktop. Thanks, dba
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/live_studio/config/models.py b/live_studio/config/models.py
index faeee37..43c5ff5 100644
--- a/live_studio/config/models.py
+++ b/live_studio/config/models.py
@@ -15,14 +15,14 @@ class Config(models.Model):
     )
 
     base = models.CharField(
-        max_length=8,
+        max_length=50,
         default='standard',
         choices=(
-            ('standard',    'Standard Debian GNU/Linux image'),
-            ('gnome',       'GNOME desktop environment'),
-            ('kde',         'KDE desktop environment'),
-            ('xfce',        'Xfce desktop environment'),
-            ('rescue',      'Debian GNU/Linux rescue image'),
+            ('standard',        'Standard Debian GNU/Linux image'),
+            ('gnome-desktop',   'GNOME desktop environment'),
+            ('kde-desktop',     'KDE desktop environment'),
+            ('xfce-desktop',    'Xfce desktop environment'),
+            ('rescue',          'Debian GNU/Linux rescue image'),
         ),
     )
 

-- 
live-studio