From: Mikael Frykholm Date: Mon, 23 May 2016 18:02:01 +0000 (+0200) Subject: Applied patch from tuttle@somsants.net. X-Git-Url: https://git.frykholm.com/butterbackup.git/commitdiff_plain/HEAD Applied patch from tuttle@somsants.net. --- diff --git a/butterbackup.py b/butterbackup.py index 2682227..110077c 100755 --- a/butterbackup.py +++ b/butterbackup.py @@ -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