branching: merge wit stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Sat, 19 Jan 2019 21:41:15 +0100
changeset 4350 5ba82f405453
parent 4349 01f4ee6779d5 (current diff)
parent 4336 33fc61e5e119 (diff)
child 4351 76500b73b1a9
child 4368 acfd2b1a6176
branching: merge wit stable
--- a/tests/testlib/pythonpath.sh	Thu Jan 17 12:37:40 2019 +0100
+++ b/tests/testlib/pythonpath.sh	Sat Jan 19 21:41:15 2019 +0100
@@ -3,8 +3,7 @@
 export SRCDIR="`dirname $TESTDIR`"
 if [ -n "$PYTHONPATH" ]; then
     export HGTEST_ORIG_PYTHONPATH=$PYTHONPATH
-    osname="`uname -o`"
-    if (uname -o | grep -q Msys); then
+    if uname -o | grep -q Msys; then
         export PYTHONPATH="$SRCDIR;$PYTHONPATH"
     else
         export PYTHONPATH=$SRCDIR:$PYTHONPATH