From: Arvin Schnell <aschnell@suse.de>
Date: Fri, 19 Apr 2013 12:04:31 +0000 (+0200)
Subject: - handle XATTRS bit
X-Git-Tag: v0.1.3~10
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=edbc5363f80fca6f6440e3d9173fd79e797aabe2;p=thirdparty%2Fsnapper.git

- handle XATTRS bit
---

diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
index 52d5cdc6..49cd0bac 100644
--- a/snapper/Btrfs.cc
+++ b/snapper/Btrfs.cc
@@ -531,10 +531,10 @@ namespace snapper
 	if (status & CREATED) status = CREATED;
 	if (status & DELETED) status = DELETED;
 
-	if (status & (CONTENT | PERMISSIONS | USER | GROUP))
+	if (status & (CONTENT | PERMISSIONS | USER | GROUP | XATTRS))
 	{
 	    // TODO check for content sometimes not required
-	    status &= ~(CONTENT | PERMISSIONS | USER | GROUP);
+	    status &= ~(CONTENT | PERMISSIONS | USER | GROUP | XATTRS);
 
 	    string dirname = snapper::dirname(name);
 	    string basename = snapper::basename(name);
@@ -627,7 +627,7 @@ namespace snapper
 	else
 	{
 	    node->status &= ~(CREATED | DELETED);
-	    node->status |= CONTENT | PERMISSIONS | USER | GROUP;
+	    node->status |= CONTENT | PERMISSIONS | USER | GROUP | XATTRS;
 	}
     }
 
@@ -760,7 +760,7 @@ namespace snapper
 		else
 		{
 		    node->status &= ~(CREATED | DELETED);
-		    node->status |= CONTENT | PERMISSIONS | USER | GROUP;
+		    node->status |= CONTENT | PERMISSIONS | USER | GROUP | XATTRS;
 		}
 
 		merge(processor, &it->second, from, to, x);
@@ -778,7 +778,7 @@ namespace snapper
 		else
 		{
 		    node->status &= ~(CREATED | DELETED);
-		    node->status |= CONTENT | PERMISSIONS | USER | GROUP;
+		    node->status |= CONTENT | PERMISSIONS | USER | GROUP | XATTRS;
 		}
 
 		merge(processor, &it->second, from, to, x);