[backupninja] backupninja: rsync action fix

Denis Fateyev dfateyev at fedoraproject.org
Tue Sep 9 12:04:18 UTC 2014


commit e3b17729ead8392b8e10bb346e5eff9bdc62bc8f
Author: Denis Fateyev <denis at fateyev.com>
Date:   Tue Sep 9 18:03:29 2014 +0600

    backupninja: rsync action fix

 backupninja-rsync-action.patch |   15 +++++++++++++++
 backupninja.spec               |    7 ++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/backupninja-rsync-action.patch b/backupninja-rsync-action.patch
new file mode 100644
index 0000000..33a26d4
--- /dev/null
+++ b/backupninja-rsync-action.patch
@@ -0,0 +1,15 @@
+--- a/handlers/rsync.in
++++ b/handlers/rsync.in
+@@ -1136,9 +1136,10 @@ for SECTION in $include; do
+   set_dest
+ 
+   info "Syncing $SECTION on $dest_path..."
+-  debug $nice $rsync ${rsync_options[@]} $filelist_flag $excludes $batch_option $orig $dest_path
++  command="$rsync ${rsync_options[@]} --delete-excluded $filelist_flag $excludes $batch_option $orig $dest_path"
++  debug $nice su -c "$command"
+   set_pipefail
+-  $nice su -c "$rsync ${rsync_options[@]} --delete-excluded $filelist_flag $excludes $batch_option $orig $dest_path" | tee -a $log
++  $nice su -c "$command" | tee -a $log
+ 
+   check_rsync_exit_status $?
+   restore_pipefail
diff --git a/backupninja.spec b/backupninja.spec
index a04d05e..f9a2e7f 100644
--- a/backupninja.spec
+++ b/backupninja.spec
@@ -1,13 +1,14 @@
 
 Name:		backupninja
 Version:	1.0.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Lightweight, extensible backup system
 
 Group:		Applications/System
 License:	GPLv2
 URL:		https://labs.riseup.net/code/projects/backupninja
 Source0:	https://labs.riseup.net/code/attachments/download/275/backupninja-1.0.1.tar.gz
+Patch0:		backupninja-rsync-action.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:	noarch
@@ -36,6 +37,7 @@ hard-linking.
 
 %prep
 %setup -q
+%patch0 -p1 -b .rsync
 
 %build
 # put all script 'libs' into one dir
@@ -72,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 08 2014 Denis Fateyev <denis at fateyev.com> - 1.0.1-4
+- Fix rsync action handler
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list