From 08e86d2218c0804f3628c39c67fa8677cbc75067 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 2 Jan 2025 10:17:39 +0000 Subject: vendor.sh inject: reset err upon return Signed-off-by: Leah Rowe --- include/vendor.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/vendor.sh b/include/vendor.sh index d6306256..29b991cd 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -340,6 +340,7 @@ fail_inject() vendor_inject() { + _olderr="$err" err="fail_inject" remkdir "$tmpromdel" @@ -363,6 +364,7 @@ vendor_inject() else printf "Tarball '%s' (board '%s) doesn't need vendorfiles.\n" \ "$archive" "$board" + err="$_olderr" return 0 fi @@ -374,6 +376,7 @@ vendor_inject() "$archive" "$xtype" [ "$xchanged" = "y" ] && [ "$nukemode" = "nuke" ] && \ printf "!!!WARNING!!! -> Vendor files removed. DO NOT FLASH.\n" + err="$_olderr" return 0 } -- cgit v1.2.1