From a0f1b047a789b368e0cb2c114330032ecc6545ee Mon Sep 17 00:00:00 2001
From: Kees Cook <kees@outflux.net>
Date: Mon, 30 Mar 2009 11:52:00 -0700
Subject: [PATCH] mk-sbuild-lv: updates to fix for bug 342154 (actually create
 directories)

---
 mk-sbuild-lv | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/mk-sbuild-lv b/mk-sbuild-lv
index a005a60..a738482 100755
--- a/mk-sbuild-lv
+++ b/mk-sbuild-lv
@@ -78,6 +78,14 @@ if [ ! -w /var/lib/sbuild ]; then
 1;
 EOM
         sensible-editor ~/.sbuildrc
+        # Create target directories, if needed
+        eval $(egrep '^\$(build|log)_dir[ 	]*=' ~/.sbuildrc | cut -c2-)
+        if [ -n "$log_dir" ]; then
+            mkdir -p "$log_dir"
+        fi
+        if [ -n "$build_dir" ]; then
+            mkdir -p "$build_dir"
+        fi
     else
         echo "Your ~/.sbuildrc already exists -- leaving it as-is."
     fi
@@ -210,18 +218,6 @@ if [ $DEBIAN ] && [ ! -x /usr/bin/cdebootstrap ]; then
     exit 1
 fi
 
-if [ ! -d $build_dir ]; then
-    echo "Build directory $build_dir does not exist."
-    echo "Please create it or change the setting in ~/.sbuildrc ."
-    exit 1
-fi
-
-if [ ! -d $log_dir ]; then
-    echo "Log directory $log_dir does not exist."
-    echo "Please create it or change the setting in ~/.sbuildrc ."
-    exit 1
-fi
-
 # Does the specified VG exist?  (vgdisplay doesn't set error codes...)
 if [ `sudo vgdisplay -c "$VG" | wc -l` -eq 0 ]; then
     exit 1