From a1026792aab22483f2d01b54884f7ae748a5cce0 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sun, 9 Feb 2014 17:37:53 -0800 Subject: [PATCH] fix(catalyst): Recreate portage snapshot with --rebuild --- build_library/catalyst.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh index 2a6ab7fb1c..c12170411b 100644 --- a/build_library/catalyst.sh +++ b/build_library/catalyst.sh @@ -250,11 +250,13 @@ build_stage() { } build_snapshot() { - if [[ -f "$CATALYST_ROOT/snapshots/portage-${FLAGS_version}.tar.bz2" ]] + local snapshot="portage-${FLAGS_version}.tar.bz2" + local snapshot_path="$CATALYST_ROOT/snapshots/${snapshot}" + if [[ -f "${snapshot_path}" && $FLAGS_rebuild == $FLAGS_FALSE ]] then - info "Skipping snapshot, portage-${FLAGS_version}.tar.bz2 exists" + info "Skipping snapshot, ${snapshot_path} exists" else - info "Creating snapshot portage-${FLAGS_version}.tar.bz2" + info "Creating snapshot ${snapshot_path}" catalyst $DEBUG -c "$TEMPDIR/catalyst.conf" -s "$FLAGS_version" fi }