can't remove file if it doesnt exist

keystone-enclave · Jun 17, 2024 · 1a0fc1a · 1a0fc1a
1 parent 73fbac4
commit 1a0fc1a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/scripts/ci/plat/cva6/flash-firmware.sh b/scripts/ci/plat/cva6/flash-firmware.sh
@@ -42,7 +42,7 @@ dd if="$FIRMWARE_FILENAME" of="$TTYDEV" bs=1 status=progress
 ./scripts/ci/utils/wait_for.py "$LOGFILE" "Hit any key to stop autoboot"
 echo 'a' > "$TTYDEV"
 
-rm "$TFTP_DIR/fw_payload.bin"
+rm -f "$TFTP_DIR/fw_payload.bin"
 cp "$FIRMWARE_FILENAME" "$TFTP_DIR/fw_payload.bin"
 echo "setenv serverip $HOST_IP" > "$TTYDEV"
 echo "setenv ipaddr $BOARD_IP" > "$TTYDEV"

diff --git a/scripts/ci/utils/wait_for.py b/scripts/ci/utils/wait_for.py
@@ -17,7 +17,10 @@
 		exit(0)
 
 	n = os.read(file.fileno(), 1)
-	if n is not None and len(n) > 0:
+	if n is None:
+		exit(1)
+
+	if len(n) > 0:
 		print(n.decode('utf-8'), end='')
 		if n[0] == pattern[index]:
 			index += 1