fix reduce_pass_size behaviour around deleted directories

bdmurray/intel-iot-models
Michael Hudson-Doyle 4 years ago
parent fc890b15e7
commit 2928c3d9cd

@ -130,6 +130,14 @@ reduce_pass_size () {
if ! diff --brief --no-dereference "$pass_dir/$f" "$parent_pass_dir/$f" >/dev/null; then if ! diff --brief --no-dereference "$pass_dir/$f" "$parent_pass_dir/$f" >/dev/null; then
continue continue
fi fi
p=$(dirname $f)
while [ "$p" != . ]; do
if [ -n "$(getfattr -n trusted.overlay.opaque -h --only-values -- "$pass_dir/$p" 2>/dev/null)" ]; then
Echo_message "reduce_pass_size: '%s' would be removed from overlay but for trusted.overlay.opaque on '%s'" "$f" "$p"
continue 2
fi
p=$(dirname $p)
done
# Files are strictly identical between the 2 passes (only mod or access times differs). No need for unused delta. # Files are strictly identical between the 2 passes (only mod or access times differs). No need for unused delta.
Echo_message "reduce_pass_size: '%s' is strictly identical between %s and %s. Removing." "$f" "$pass" "$parent" Echo_message "reduce_pass_size: '%s' is strictly identical between %s and %s. Removing." "$f" "$pass" "$parent"
rm "$pass_dir/$f" rm "$pass_dir/$f"

Loading…
Cancel
Save