diff options
author | Barton E. Schaefer <schaefer@zsh.org> | 2016-06-04 09:51:23 -0700 |
---|---|---|
committer | Barton E. Schaefer <schaefer@zsh.org> | 2016-06-04 09:51:23 -0700 |
commit | 984c18048b81c39bc06b73b484ee6e0d40340e19 (patch) | |
tree | ff292709585b9143dcd48ec42326fa28b04c52a3 | |
parent | 9c7f298447bc225666f9baa957ce933f5493d437 (diff) | |
download | zsh-984c18048b81c39bc06b73b484ee6e0d40340e19.tar.gz zsh-984c18048b81c39bc06b73b484ee6e0d40340e19.tar.xz zsh-984c18048b81c39bc06b73b484ee6e0d40340e19.zip |
38599: skip the "no such named directory" warning when NO_EXEC is in effect
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Src/subst.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 37a6fd9dc..767af7991 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-06-04 Barton E. Schaefer <schaefer@zsh.org> + + * 38599: Src/subst.c: skip the "no such named directory" warning + when NO_EXEC is in effect + 2016-06-03 Barton E. Schaefer <schaefer@zsh.org> * users/21609: Completion/Unix/Type/_path_files: do not treat diff --git a/Src/subst.c b/Src/subst.c index 4e13ce11d..8e704b1c1 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -691,7 +691,7 @@ filesubstr(char **namptr, int assign) return 0; *ptr = 0; if (!(hom = getnameddir(++str))) { - if (isset(NOMATCH)) + if (isset(NOMATCH) && isset(EXECOPT)) zerr("no such user or named directory: %s", str); *ptr = save; return 0; |