Completely disable ACL support on OS X for now.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/README.md b/README.md
index 2d40826a02b4bb9127c9902abd264e5ab5809b47..3fcdcc6816e13f15e4567d78db65a5888829d8ca 100644 (file)
--- a/README.md
+++ b/README.md
@@ -272,6 +272,13 @@ Notes on Cygwin
    http://cygwin.com/ml/cygwin/2007-06/msg00436.html
 
 
+Notes on OS X
+-------------
+
+ - There is no support for ACLs.  If/when some entrprising person
+   fixes this, adjust t/compare-trees.
+
+
 How it works
 ============
 

diff --git a/lib/bup/metadata.py b/lib/bup/metadata.py
index 384991ed7b46ff52e61d6b7ea23e0b44729f44c7..bdf3738faae156fb47d09da7acac8c948c16b516 100644 (file)
--- a/lib/bup/metadata.py
+++ b/lib/bup/metadata.py
@@ -27,7 +27,7 @@ if sys.platform.startswith('linux'):
             xattr = None
 
 posix1e = None
-if not sys.platform.startswith('cygwin'):
+if not (sys.platform.startswith('cygwin') or sys.platform.startswith('darwin')):
     try:
         import posix1e
     except ImportError:

diff --git a/t/compare-trees b/t/compare-trees
index 80b056a1cdc8b73009c9cff434867bd4a99056ae..b611b0f489402e4b56d1652661ffb75b3b0a5640 100755 (executable)
--- a/t/compare-trees
+++ b/t/compare-trees
@@ -48,12 +48,15 @@ trap "rm -rf '${tmpfile}'" EXIT
 rsync_opts="-niaH$verify_content --delete"
 
 if rsync --version | grep -q xattrs; then
-    if [[ $(uname) =~ CYGWIN ]]; then
-        # bup doesn't support ACLs on Cygwin yet.
-        rsync_opts="$rsync_opts -X"
-    else
-        rsync_opts="$rsync_opts -AX"
-    fi
+    case $OSTYPE in
+        cygwin|darwin)
+            # bup doesn't support ACLs here yet.
+            rsync_opts="$rsync_opts -X"
+            ;;
+        *)
+            rsync_opts="$rsync_opts -AX"
+            ;;
+    esac
 else
     echo "Not comparing xattrs/acls (unsupported by available rsync)." 1>&2
 fi