]> arthur.barton.de Git - bup.git/commitdiff
Ignore unimplemented metadata record during read (_rec_tag_nfsv4_acl).
authorRob Browning <rlb@defaultvalue.org>
Wed, 18 Sep 2013 17:20:28 +0000 (12:20 -0500)
committerRob Browning <rlb@defaultvalue.org>
Wed, 18 Sep 2013 17:30:44 +0000 (12:30 -0500)
Don't test for _rec_tag_nfsv4_acl and then try to call an
unimplemented method in Metadata.read().  Otherwise, if/when we do add
support, older versions of bup will choke on it.

Thanks to Alexander Barton <alex@barton.de> for pointing this out.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
lib/bup/metadata.py

index 168d1c97edb41d0d8c5eeaf531826619d9110522..c851525c108642181d83ad2b8b88e653fe8df796 100644 (file)
@@ -166,7 +166,7 @@ _rec_tag_path = 1
 _rec_tag_common = 2           # times, user, group, type, perms, etc.
 _rec_tag_symlink_target = 3
 _rec_tag_posix1e_acl = 4      # getfacl(1), setfacl(1), etc.
-_rec_tag_nfsv4_acl = 5        # intended to supplant posix1e acls?
+_rec_tag_nfsv4_acl = 5        # intended to supplant posix1e? (unimplemented)
 _rec_tag_linux_attr = 6       # lsattr(1) chattr(1)
 _rec_tag_linux_xattr = 7      # getfattr(1) setfattr(1)
 _rec_tag_hardlink_target = 8 # hard link target path
@@ -705,8 +705,6 @@ class Metadata:
                     result._load_hardlink_target_rec(port)
                 elif tag == _rec_tag_posix1e_acl:
                     result._load_posix1e_acl_rec(port)
-                elif tag == _rec_tag_nfsv4_acl:
-                    result._load_nfsv4_acl_rec(port)
                 elif tag == _rec_tag_linux_attr:
                     result._load_linux_attr_rec(port)
                 elif tag == _rec_tag_linux_xattr: