[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777

[Chris Lamb]

The following commit has been merged in the master branch:
commit ad2f094aa5b126e31f422d3df598584b436b28d1
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Jul 29 17:05:44 2010 -0400

    Rename 'builds' variables.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/config/settings/defaults/dirs.py b/config/settings/defaults/dirs.py
index 4d203a7..1e0a2ed 100644
--- a/config/settings/defaults/dirs.py
+++ b/config/settings/defaults/dirs.py
@@ -10,5 +10,5 @@ TEMPLATE_DIRS = (
 # Example: "/home/media/media.lawrence.com/"
 MEDIA_ROOT = join(LIVE_STUDIO_BASE, 'media')
 
-BUILDS_DIR = join(LIVE_STUDIO_BASE, 'builds')
-BUILDS_DIR_WWW = '/builds'
+BUILDS_ROOT = join(LIVE_STUDIO_BASE, 'builds')
+BUILDS_URL = '/builds'
diff --git a/live_studio/build/management/commands/queue_runner.py b/live_studio/build/management/commands/queue_runner.py
index cf53690..7204345 100644
--- a/live_studio/build/management/commands/queue_runner.py
+++ b/live_studio/build/management/commands/queue_runner.py
@@ -63,7 +63,7 @@ class Command(NoArgsCommand):
         subprocess.check_call(('lh', 'config') + build.config.options())
         subprocess.check_call(('lh', 'build'))
 
-        target_dir = os.path.join(settings.BUILDS_DIR, build.ident)
+        target_dir = os.path.join(settings.BUILDS_ROOT, build.ident)
         os.makedirs(target_dir)
 
         for extension in ('iso', 'img'):
diff --git a/live_studio/debug/urls.py b/live_studio/debug/urls.py
index f8576b3..fcaf706 100644
--- a/live_studio/debug/urls.py
+++ b/live_studio/debug/urls.py
@@ -9,7 +9,7 @@ if settings.DEBUG:
         (r'^media/(?P<path>.*)$', 'serve',
             {'document_root': settings.MEDIA_ROOT}),
         (r'^builds/(?P<path>.*)$', 'serve',
-            {'document_root': settings.BUILDS_DIR}),
+            {'document_root': settings.BUILDS_ROOT}),
         (r'^(?P<path>favicon.ico|robots\.txt)$', 'serve',
             {'document_root': settings.MEDIA_ROOT}),
     )
diff --git a/templates/config/view.html b/templates/config/view.html
index 881542f..93399fd 100644
--- a/templates/config/view.html
+++ b/templates/config/view.html
@@ -35,7 +35,8 @@
 
   	{% if build.status == "success"%}
       <strong>Finished.</strong>
-      <a href="{{ settings.BUILDS_DIR_WWW }}/{{ build.ident }}/{{ build.filename }}">Download</a>
+      {{ settings }}
+      <a href="{{ settings.BUILDS_URL }}/{{ build.ident }}/{{ build.filename }}">Download</a>
     {% endif %}
 
   </td>

-- 
live-studio