summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/subst.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0fdb58445..37f45f3b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-28 Peter Stephenson <p.stephenson@samsung.com>
+
+ * 49102: Src/subst.c: Dynamic directory expansion failure is
+ ignored if NO_EXEC is set.
+
2021-06-22 Peter Stephenson <p.stephenson@samsung.com>
* 48906: Doc/Zsh/manual.yo, Doc/Zsh/metafaq.yo, Etc/FAQ.yo,
diff --git a/Src/subst.c b/Src/subst.c
index 9928be0e9..87a56c3c6 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -765,7 +765,7 @@ filesubstr(char **namptr, int assign)
*namptr = dyncat(res, ptr2+1);
return 1;
}
- if (isset(NOMATCH))
+ if (isset(NOMATCH) && isset(EXECOPT))
zerr("no directory expansion: ~[%s]", tmp);
return 0;
} else if (!inblank(str[1]) && isend(*ptr) &&