diff options
| author | planetmaker <planetmaker@openttd.org> | 2014-11-09 16:37:07 +0000 |
|---|---|---|
| committer | planetmaker <planetmaker@openttd.org> | 2014-11-09 16:37:07 +0000 |
| commit | bc371a2d9eee04a5a495dc7470673c2fc4418da2 (patch) | |
| tree | 7cda10b3cd8138f5d169d39c78c2044596cfee61 | |
| parent | ab087d2d1c27cb2d4a864f6d51ea3b23bc0e3bef (diff) | |
| download | openttd-bc371a2d9eee04a5a495dc7470673c2fc4418da2.tar.xz | |
(svn r27059) -Change: [Makefile] Make sure to use plain mercurial output unaltered by personal presets
| -rw-r--r-- | config.lib | 2 | ||||
| -rwxr-xr-x | findversion.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config.lib b/config.lib index 9698a052a..72c8fb0dc 100644 --- a/config.lib +++ b/config.lib @@ -1037,7 +1037,7 @@ check_params() { log 1 "checking revision... svn detection (tag)" elif [ -d "$ROOT_DIR/.git" ] && [ -n "`git help 2>/dev/null`" ]; then log 1 "checking revision... git detection" - elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help 2>/dev/null`" ]; then + elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`HGPLAIN= hg help 2>/dev/null`" ]; then log 1 "checking revision... hg detection" elif [ -f "$ROOT_DIR/.ottdrev" ]; then log 1 "checking revision... source tarball" diff --git a/findversion.sh b/findversion.sh index c0d500a8f..362d9b545 100755 --- a/findversion.sh +++ b/findversion.sh @@ -106,12 +106,12 @@ elif [ -d "$ROOT_DIR/.git" ]; then fi elif [ -d "$ROOT_DIR/.hg" ]; then # We are a hg checkout - if [ -n "`hg status | grep -v '^?'`" ]; then + if [ -n "`HGPLAIN= hg status | grep -v '^?'`" ]; then MODIFIED="2" fi - HASH=`LC_ALL=C hg id -i | cut -c1-12` + HASH=`LC_ALL=C HGPLAIN= hg id -i | cut -c1-12` REV="h`echo $HASH | cut -c1-8`" - BRANCH="`hg branch | sed 's@^default$@@'`" + BRANCH="`HGPLAIN= hg branch | sed 's@^default$@@'`" TAG="`hg id -t | grep -v 'tip$'`" if [ -n "$TAG" ]; then BRANCH="" |