From: Eric Biggers <ebiggers3@gmail.com>
Date: Tue, 11 Sep 2018 02:58:10 +0000 (-0700)
Subject: wimappend: with --create, ignore --update-of nonexistent target file
X-Git-Tag: v1.13.0~4
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=e7e2c4d677c3c40b45160ace50159ee18fcb4986

wimappend: with --create, ignore --update-of nonexistent target file
---

diff --git a/programs/imagex.c b/programs/imagex.c
index a274f78b..a372c14e 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -2102,8 +2102,20 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 	} else {
 		struct stat stbuf;
 
-		if (create && tstat(wimfile, &stbuf) != 0 && errno == ENOENT)
+		/* Check for 'wimappend --create' acting as wimcapture */
+		if (create && tstat(wimfile, &stbuf) != 0 && errno == ENOENT) {
+
 			appending = false;
+
+			/* Ignore '--update-of' for the target WIMFILE */
+			if (template_image_name_or_num &&
+			    (!template_wimfile ||
+			     !tstrcmp(template_wimfile, wimfile)))
+			{
+				template_image_name_or_num = NULL;
+				template_wimfile = NULL;
+			}
+		}
 	}
 
 	if ((write_flags & WIMLIB_WRITE_FLAG_UNSAFE_COMPACT) && !appending) {