diff options
| author | Gary Kramlich <grim@reaperworld.com> | 2016-10-19 17:52:33 +0000 |
|---|---|---|
| committer | Gary Kramlich <grim@reaperworld.com> | 2016-10-19 17:52:33 +0000 |
| commit | 04fb78aa676aeff3f30be5e88c3f9afe326d6fde (patch) | |
| tree | 217ba9aadab29fbd9821c1ee79e718d91e8755a3 | |
| parent | 62ec7e7cf1c6a0f80bcad269f71e247cee73c0b9 (diff) | |
| parent | 4e69590bd888bcacd8de81fd0565674d0f28318e (diff) | |
| download | pidgin-04fb78aa676aeff3f30be5e88c3f9afe326d6fde.tar.gz | |
Merged in dequisdequis/pidgin/release-2.x.y (pull request #155)
Makefile: Use hg log instead of hg id --debug, which has unstable output
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index cba9df2192..587931147c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,8 +50,8 @@ version-check: head ChangeLog.API | grep "^version $(PACKAGE_VERSION):$$" >/dev/null # Ensure we're working from a tag... - test x`hg log -r "tag($(PACKAGE_VERSION))" --template "{node}"` = x`hg id -i --debug` -# ... and have no changes in the working copy. (this isn't really necessary with hg because hg id appends a "+") + test x`hg log -r "tag($(PACKAGE_VERSION))" --template "{node}"` = x`hg log -r . -T '{node}'` +# ... and have no changes in the working copy. test "x`hg st -mard`" = x sign-packages: dist @@ -82,7 +82,7 @@ endif # successfully; the rm -f ensures both package_revision_raw.txt: .FORCE $(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \ - (hg --cwd $(srcdir) id -i --debug) 2>/dev/null >$@.new \ + (hg --cwd $(srcdir) log -r . -T {node}) 2>/dev/null >$@.new \ || rm -f $@.new $(AM_V_at)if test -f $@.new; then \ if ! diff $@ $@.new > /dev/null; then \ |