From 5eaf2423261cfcab466a7de11acfa573781d8f7f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 3 Dec 2020 09:53:07 -0800 Subject: [PATCH] Adjust diff-pr.sh to no longer tolerate "bashbrew cat" failures (since we handle "new" and "deleted" images as special cases now) --- diff-pr.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/diff-pr.sh b/diff-pr.sh index b495ccf13f73e..fe9a285207d23 100755 --- a/diff-pr.sh +++ b/diff-pr.sh @@ -258,12 +258,11 @@ for img; do touch "$BASHBREW_LIBRARY/$img"; [ -s "$BASHBREW_LIBRARY/$img" ] || e bashbrew list "$@" 2>>temp/_bashbrew.err | sort -uV > temp/_bashbrew-list || : "$diffDir/_bashbrew-cat-sorted.sh" "$@" 2>>temp/_bashbrew.err > temp/_bashbrew-cat || : for image; do - if script="$(bashbrew cat --format "$template" "$image")"; then - mkdir tar - ( eval "$script" | tar -xiC tar ) - copy-tar tar temp - rm -rf tar - fi + script="$(bashbrew cat --format "$template" "$image")" + mkdir tar + ( eval "$script" | tar -xiC tar ) + copy-tar tar temp + rm -rf tar done git -C temp add . || : git -C temp commit --quiet --allow-empty -m 'initial' || :