diff options
| author | Peter Stephenson <pws@zsh.org> | 2013-11-14 11:59:22 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2013-11-14 11:59:35 +0000 |
| commit | 11d8781a3f8dc4a80128f9ec82644c05ae16f6ec (patch) | |
| tree | 6c147b4f4bf3fdbb696392e39e801db4516f47af | |
| parent | 4c611f9323a516b95c3da19065e3f9040074de7e (diff) | |
| download | zsh-11d8781a3f8dc4a80128f9ec82644c05ae16f6ec.tar.gz zsh-11d8781a3f8dc4a80128f9ec82644c05ae16f6ec.tar.xz zsh-11d8781a3f8dc4a80128f9ec82644c05ae16f6ec.zip | |
31983: suppress warning from cmp when genering patchlevel.h.
The warning doesn't indicate a problem, so isn't useful.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/zsh.mdd | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index c22054372..e22c2e746 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2013-11-14 Peter Stephenson <p.stephenson@samsung.com> + * 31983: Src/zsh.mdd: suppress warning from cmp that doesn't + indicate a problem when generating patchlevel header. + * 31982: Src/math.c, Test/C01arith.ztst: detection of floating point constants had run rampant in users/17445. Fix the original problem another way. diff --git a/Src/zsh.mdd b/Src/zsh.mdd index 4bc884b3d..d77fc4336 100644 --- a/Src/zsh.mdd +++ b/Src/zsh.mdd @@ -44,7 +44,7 @@ patchlevel.h: FORCE cp -f $(sdir)/$@.release $@; \ else \ echo '#define ZSH_PATCHLEVEL "'`cd $(sdir) && git describe --tags --long`'"' > $@.tmp; \ - cmp $@ $@.tmp && rm -f $@.tmp || mv $@.tmp $@; \ + cmp $@ $@.tmp 2>/dev/null && rm -f $@.tmp || mv $@.tmp $@; \ fi FORCE: |