Merge lp:~doanac/lava-master-image-scripts/mkdir-for-cache into lp:lava-master-image-scripts

Proposed by Andy Doan
Status: Merged
Merged at revision: 51
Proposed branch: lp:~doanac/lava-master-image-scripts/mkdir-for-cache
Merge into: lp:lava-master-image-scripts
Diff against target: 19 lines (+2/-0)
1 file modified
lava-create-master (+2/-0)
To merge this branch: bzr merge lp:~doanac/lava-master-image-scripts/mkdir-for-cache
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+101437@code.launchpad.net

Description of the change

The new .cache support didn't work for me because the target directories for files we create weren't there. This fixes the issue for me.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lava-create-master'
--- lava-create-master 2012-04-10 12:08:23 +0000
+++ lava-create-master 2012-04-10 19:40:33 +0000
@@ -204,6 +204,7 @@
204 # The expected md5 checksum is $3204 # The expected md5 checksum is $3
205 check_md5_or_remove "$1" "$3" && return 0205 check_md5_or_remove "$1" "$3" && return 0
206 echo " * Downloading $2..."206 echo " * Downloading $2..."
207 mkdir -p `dirname $1`
207 if ! wget \208 if ! wget \
208 --output-document="$1" \209 --output-document="$1" \
209 --user-agent="lava-create-master ($LAVA_VERSION)" \210 --user-agent="lava-create-master ($LAVA_VERSION)" \
@@ -328,6 +329,7 @@
328 chown_to_user "$CACHE_DIR/image-pieces/$ROOTFS"329 chown_to_user "$CACHE_DIR/image-pieces/$ROOTFS"
329330
330 # Use LMC to assemble the image 331 # Use LMC to assemble the image
332 mkdir -p $CACHE_DIR/pristine-images
331 verbose " * Building vanilla image with linaro-media-create..."333 verbose " * Building vanilla image with linaro-media-create..."
332 if ! linaro-media-create \334 if ! linaro-media-create \
333 --dev $LMC_DEV \335 --dev $LMC_DEV \

Subscribers

People subscribed via source and target branches