[SCM] live-build branch, debian-next, updated. debian/3.0_a25-1-50-g1deaeb0
Daniel Baumann
daniel at debian.org
Thu Aug 4 11:19:31 UTC 2011
The following commit has been merged in the debian-next branch:
commit 1deaeb04e59c4afd76d69b53d4e9ffc2a9a7b930
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Aug 4 13:19:37 2011 +0200
Adjusting check for target directory in live-build-cron scripts to fail if non-directories are used, thanks to Ben Armstrong <synrg at debian.org>.
diff --git a/cron/live-build-cron-images b/cron/live-build-cron-images
index c76d96e..334d039 100755
--- a/cron/live-build-cron-images
+++ b/cron/live-build-cron-images
@@ -30,8 +30,11 @@ Init ()
exit 0
fi
- if [ -z "${LIVE_BUILD_CRON_IMAGES_DIRECTORY}" ]
+ mkdir -p "${LIVE_BUILD_CRON_IMAGES_DIRECTORY}"
+
+ if [ ! -d "${LIVE_BUILD_CRON_IMAGES_DIRECTORY}" ]
then
+ echo "E: live-build-cron-images directory not set."
exit 1
fi
diff --git a/cron/live-build-cron-manual b/cron/live-build-cron-manual
index de38a32..7a7c4a0 100755
--- a/cron/live-build-cron-manual
+++ b/cron/live-build-cron-manual
@@ -31,7 +31,9 @@ Init ()
exit 0
fi
- if [ -z "${LIVE_BUILD_CRON_MANUAL_DIRECTORY}" ]
+ mkdir -p "${LIVE_BUILD_CRON_MANUAL_DIRECTORY}"
+
+ if [ ! -d "${LIVE_BUILD_CRON_MANUAL_DIRECTORY}" ]
then
echo "E: live-build-cron-manual directory not set."
exit 1
--
live-build
More information about the debian-live-changes
mailing list