瀏覽代碼

FreeBSD: simplify numeric_ids check

Thomas Waldmann 1 年之前
父節點
當前提交
4ebb5cdf3c
共有 1 個文件被更改,包括 6 次插入5 次删除
  1. 6 5
      src/borg/platform/freebsd.pyx

+ 6 - 5
src/borg/platform/freebsd.pyx

@@ -170,11 +170,12 @@ def acl_get(path, item, st, numeric_ids=False, fd=None):
 cdef _set_acl(path, type, item, attribute, numeric_ids=False, fd=None):
 cdef _set_acl(path, type, item, attribute, numeric_ids=False, fd=None):
     cdef acl_t acl = NULL
     cdef acl_t acl = NULL
     text = item.get(attribute)
     text = item.get(attribute)
-    if text is not None:
-        if numeric_ids and type == ACL_TYPE_NFS4:
-            text = _nfs4_use_stored_uid_gid(text)
-        elif numeric_ids and type in (ACL_TYPE_ACCESS, ACL_TYPE_DEFAULT):
-            text = posix_acl_use_stored_uid_gid(text)
+    if text:
+        if numeric_ids:
+            if type == ACL_TYPE_NFS4:
+                text = _nfs4_use_stored_uid_gid(text)
+            elif type in (ACL_TYPE_ACCESS, ACL_TYPE_DEFAULT):
+                text = posix_acl_use_stored_uid_gid(text)
         acl = acl_from_text(<bytes>text)
         acl = acl_from_text(<bytes>text)
         if acl == NULL:
         if acl == NULL:
             raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
             raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))