From 8a41ed59238b17c8367dfb3d178904a50b6de334 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 2 Dec 2015 13:55:29 +0100 Subject: [PATCH] Use portable arguments for find and cmp --- diffoscope/comparators/binary.py | 2 +- diffoscope/comparators/directory.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/diffoscope/comparators/binary.py b/diffoscope/comparators/binary.py index cc2d5d9..33d27fe 100644 --- a/diffoscope/comparators/binary.py +++ b/diffoscope/comparators/binary.py @@ -185,7 +185,7 @@ class File(object, metaclass=ABCMeta): if open(self.path, 'rb').read() == open(other.path, 'rb').read(): return True - return 0 == subprocess.call(['cmp', '--silent', self.path, other.path], + return 0 == subprocess.call(['cmp', '-s', self.path, other.path], shell=False, close_fds=True) diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py index 2141572..8862acd 100644 --- a/diffoscope/comparators/directory.py +++ b/diffoscope/comparators/directory.py @@ -31,7 +31,7 @@ from diffoscope.comparators.utils import Container, Command class FindAll(Command): @tool_required('find') def cmdline(self): - return ['find', self.path, '-printf', '%P\n'] + return ['find', self.path, '-print'] class Stat(Command): -- 2.6.3