From a2fd94c5901f6a6057a68b3bcc542aab45a68c0f Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 2 Dec 2015 17:27:58 +0100 Subject: [PATCH] Make directory comparison work on non Linux Only FreeBSD and Linux has getfacl. getfacl has incomaptible option list between Linux and FreeBSD, so change the call depending on the OS. --- diffoscope/comparators/directory.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py index 8e5d10b..15a2f8f 100644 --- a/diffoscope/comparators/directory.py +++ b/diffoscope/comparators/directory.py @@ -81,7 +81,11 @@ def lsattr(path): class Getfacl(Command): @tool_required('getfacl') def cmdline(self): - return ['getfacl', '-p', '-c', self.path] + osname = os.uname()[0] + if osname == 'FreeBSD': + return ['getfacl', '-q', '-h', self.path] + else: # FreeBSD + return ['getfacl', '-p', '-c', self.path] def compare_meta(path1, path2): -- 2.11.0