]> git.frykholm.com Git - butterbackup.git/commitdiff
Applied patch from tuttle@somsants.net. master
authorMikael Frykholm <mikael@frykholm.com>
Mon, 23 May 2016 18:02:01 +0000 (20:02 +0200)
committerMikael Frykholm <mikael@frykholm.com>
Mon, 23 May 2016 18:02:01 +0000 (20:02 +0200)
butterbackup.py

index 26822276a29d6449bb03069493c3be4d85ec498e..110077c1065fe23c9726306a3fd84f5e74107425 100755 (executable)
@@ -29,10 +29,15 @@ class Host():
                 return() 
             
         command = ("rsync -a --acls --xattrs --whole-file --numeric-ids --delete --delete-excluded --human-readable --inplace ")
-        excludes = " --exclude " + " --exclude ".join(self.config.get("host", "exclude").split(',')) #FIXME
+        if self.config.has_option("host", "include"):
+            includes = " --include " + " --include ".join(self.config.get("host", "include").split(',')) #FIXME
+            command = command + includes
+        if self.config.has_option("host", "exclude"):
+            excludes = " --exclude " + " --exclude ".join(self.config.get("host", "exclude").split(',')) #FIXME
+            command = command + excludes
         try:
-            print(command + excludes + " root@%s:/ "%(self.name) + self.subvol_dir)
-            check_call(shlex.split(command + excludes + " root@%s:/ "%(self.name) + self.subvol_dir))
+            print(command + " root@%s:/ "%(self.name) + self.subvol_dir)
+            check_call(shlex.split(command + " root@%s:/ "%(self.name) + self.subvol_dir))
         except CalledProcessError as ex:
             if ex.returncode in (24,):
                 pass