pidgin/pidgin

Makefile: Use hg log instead of hg id --debug, which has unstable output
release-2.x.y
2016-10-05, dx
478cf4acf83d
Parents be8d0f7d0041
Children 6016f081e2fa
Makefile: Use hg log instead of hg id --debug, which has unstable output

See comments in http://stackoverflow.com/a/2485923/2195033

Also the fact that it was just broken for me - it threw debug info to stdout
("ignoring untrusted configuration option") when running 'sudo make install',
which ended up in package_revision_raw.txt, which broke the build.
1 files changed, 3 insertions(+), 3 deletions(-)
  • +3 -3
    Makefile.am
    • --- a/Makefile.am Wed Oct 05 16:19:47 2016 -0500
    +++ b/Makefile.am Wed Oct 05 23:18:03 2016 -0300
    @@ -50,8 +50,8 @@
    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 @@
    # 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 \