[diffoscope] 01/01: Only try "g"+command if it was not already remapped, e.g. with --tool-prefix-binutils

Ximin Luo infinity0 at debian.org
Wed Aug 16 16:14:23 CEST 2017

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository diffoscope.

commit 54d4bb1a70eae6798fd1c1d921ddbdb5eb0bd7c4
Author: Ximin Luo <infinity0 at debian.org>
Date:   Wed Aug 16 16:14:03 2017 +0200

    Only try "g"+command if it was not already remapped, e.g. with --tool-prefix-binutils
 diffoscope/tools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diffoscope/tools.py b/diffoscope/tools.py
index 5408fa3..1549b7f 100644
--- a/diffoscope/tools.py
+++ b/diffoscope/tools.py
@@ -75,7 +75,7 @@ def tool_required(command):
             This ensures that any os.environ['PATH'] modifications are
             performed prior to the `find_executable` tests.
-            if not os_is_gnu():
+            if command == get_tool_name(command) and not os_is_gnu():
                 # try "g" + command for each tool, if we're on a non-GNU system
                 if find_executable("g" + command):
                     tool_prepend_prefix("g", command)

Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git

More information about the diffoscope mailing list