diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-02-27 12:22:17 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-02-27 13:10:45 +0000 |
| commit | 94abd2410c44e93b16bc7818b00e7c5040a6b765 (patch) | |
| tree | ac277944b63a493fc691aa1e8b98064ab734c425 /run-bootstrap-in-chroot | |
| parent | 114e276f7c1da9c06cce0dd5e1b89f289b61f507 (diff) | |
| download | morph-94abd2410c44e93b16bc7818b00e7c5040a6b765.tar.gz | |
scripts: don't skip if not snapshotting
run-bootstrap-in-chroot would not build a stage if it had a snapshot
for the next stage.
If the same directory had previously run while snapshotting then
it would skip earlier stages without building them as it used to be
able to extract that tarball.
This fails as stages depend on earlier stages.
This change is so that it will build if it is not snapshotting or
if the stage has not been snapshotted.
Diffstat (limited to 'run-bootstrap-in-chroot')
| -rwxr-xr-x | run-bootstrap-in-chroot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot index 05207207..fe80f3c5 100755 --- a/run-bootstrap-in-chroot +++ b/run-bootstrap-in-chroot @@ -142,13 +142,13 @@ fi # Unpack existing snapshot, or run pass1 of bootstrap and then make snapshot. -if ! has_pass pass2a +if ! "$snapshot" || ! has_pass pass2a then run_pass "$dir" pass1 fi -if ! has_pass pass2b +if ! "$snapshot" || ! has_pass pass2b then run_pass "$dir" pass2a fi |