[PATCH] Do not ignore errors from tar

[PATCH] Do not ignore errors from tar

[Demi Marie Obenour]

These would be ignored due to a missing -o pipefail in the shell script.
As a result, listing nonexistent s6-rc-compile inputs would cause a
broken image to be successfully built.

Also remove newlines that broke Vim syntax highlighting.

Reported-by: Alyssa Ross <hi@alyssa.is>
Link: https://spectrum-os.org/lists/archives/spectrum-devel/87segu879h.fsf@alyssa.is
Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
---
 host/rootfs/Makefile | 5 ++---
 img/app/Makefile     | 5 ++---
 vm/sys/net/Makefile  | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile
index b11ba50f369c3440572e06a7eaca429fbe6746a1..322d75026dbcba4301f26abfbf74efa8cc68cdfd 100644
--- a/host/rootfs/Makefile
+++ b/host/rootfs/Makefile
@@ -168,9 +168,8 @@ S6_RC_FILES = \
 build/etc/s6-rc: $(S6_RC_FILES)
 	mkdir -p $$(dirname $@)
 	rm -rf $@
-
-	dir=$$(mktemp -d) && \
-	    tar -c $(S6_RC_FILES) | tar -C $$dir -x --strip-components 3 && \
+	set -uo pipefail && dir=$$(mktemp -d) && \
+	    { tar -c $(S6_RC_FILES) | tar -C $$dir -x --strip-components 3; } && \
 	    s6-rc-compile $@ $$dir; \
 	    exit=$$?; rm -r $$dir; exit $$exit
 
diff --git a/img/app/Makefile b/img/app/Makefile
index c83b37364c16576e2609f5005b8a6092b644867b..8b9ecf990fe10adb7aa19b46935826d684f10686 100644
--- a/img/app/Makefile
+++ b/img/app/Makefile
@@ -116,9 +116,8 @@ VM_S6_RC_FILES = \
 build/etc/s6-rc: $(VM_S6_RC_FILES)
 	mkdir -p $$(dirname $@)
 	rm -rf $@
-
-	dir=$$(mktemp -d) && \
-	    tar -c $(VM_S6_RC_FILES) | tar -C $$dir -x --strip-components 3 && \
+	set -uo pipefail && dir=$$(mktemp -d) && \
+	    { tar -c $(VM_S6_RC_FILES) | tar -C $$dir -x --strip-components 3; } && \
 	    s6-rc-compile $@ $$dir; \
 	    exit=$$?; rm -r $$dir; exit $$exit
 
diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile
index 79be242ea26e37d6f02af8761320de27d69d5b69..0193cc8c09f895a6021de0d02fde20362818e185 100644
--- a/vm/sys/net/Makefile
+++ b/vm/sys/net/Makefile
@@ -81,9 +81,8 @@ VM_S6_RC_FILES = \
 build/etc/s6-rc: $(VM_S6_RC_FILES)
 	mkdir -p $$(dirname $@)
 	rm -rf $@
-
-	dir=$$(mktemp -d) && \
-	    tar -c $(VM_S6_RC_FILES) | tar -C $$dir -x --strip-components 3 && \
+	set -uo pipefail && dir=$$(mktemp -d) && \
+	    { tar -c $(VM_S6_RC_FILES) | tar -C $$dir -x --strip-components 3; } && \
 	    s6-rc-compile $@ $$dir; \
 	    exit=$$?; rm -r $$dir; exit $$exit
 

---
base-commit: 15ca6c4684313fcc9fcde3bda97d64698bb267ea
change-id: 20250919-no-ignore-tar-errors-cea4c781cbbf
-- 
Sincerely,
Demi Marie Obenour (she/her/hers)

Re: [PATCH] Do not ignore errors from tar

[Alyssa Ross]

This patch has been committed as 2e9d63d3e213939615d3dcc44bcb3aa2e8dfa77f,
which can be viewed online at
https://spectrum-os.org/git/spectrum/commit/?id=2e9d63d3e213939615d3dcc44bcb3aa2e8dfa77f.

This is an automated message.  Send comments/questions/requests to:
Alyssa Ross <hi@alyssa.is>

Re: [PATCH] Do not ignore errors from tar

[Alyssa Ross]

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

Demi Marie Obenour <demiobenour@gmail.com> writes:

> These would be ignored due to a missing -o pipefail in the shell script.
> As a result, listing nonexistent s6-rc-compile inputs would cause a
> broken image to be successfully built.
>
> Also remove newlines that broke Vim syntax highlighting.

Reported to vim? :)  I don't mind removing them in this case, but being
able to use empty lines between command lines is going to be important
for readability sometimes!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]