summaryrefslogtreecommitdiffstats
path: root/geo-replication/syncdaemon/master.py
diff options
context:
space:
mode:
Diffstat (limited to 'geo-replication/syncdaemon/master.py')
-rw-r--r--geo-replication/syncdaemon/master.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py
index ef79f02a52c..aedfc232b07 100644
--- a/geo-replication/syncdaemon/master.py
+++ b/geo-replication/syncdaemon/master.py
@@ -886,7 +886,8 @@ class GMasterChangelogMixin(GMasterCommon):
elif ec[1] == 'SETXATTR':
# To sync xattr/acls use rsync/tar, --xattrs and --acls
# switch to rsync and tar
- if boolify(gconf.sync_xattrs) or boolify(gconf.sync_acls):
+ if not boolify(gconf.use_tarssh) and \
+ (boolify(gconf.sync_xattrs) or boolify(gconf.sync_acls)):
datas.add(os.path.join(pfx, ec[0]))
else:
logging.warn('got invalid changelog type: %s' % (et))