[rsnapshot] bug 1005911 - added lvm-quiet patch to correct lvremove handling

[Steven Roberts]

commit fc2cc775ca54db062b222a80a92e883570d28994
Author: Steven Roberts <strobert at strobe.net>
Date:   Tue Sep 10 22:22:21 2013 -0700

    bug 1005911 - added lvm-quiet patch to correct lvremove handling

 lvm-quiet.patch |   25 +++++++++++++++++++++++++
 rsnapshot.spec  |    9 ++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/lvm-quiet.patch b/lvm-quiet.patch
new file mode 100644
index 0000000..fc2e645
--- /dev/null
+++ b/lvm-quiet.patch
@@ -0,0 +1,25 @@
+diff -up rsnapshot-1.3.1/rsnapshot-program.pl.lvm-quiet rsnapshot-1.3.1/rsnapshot-program.pl
+--- rsnapshot-1.3.1/rsnapshot-program.pl.lvm-quiet	2013-09-09 22:16:12.177041378 -0700
++++ rsnapshot-1.3.1/rsnapshot-program.pl	2013-09-10 22:06:46.193923280 -0700
+@@ -3728,9 +3728,7 @@ sub rsync_backup_point {
+         
+         print_cmd(@cmd_stack);
+         if (0 == $test) {
+-            # silence gratuitous lvremove output
+-            #$result = system(@cmd_stack);
+-            $result = system(join " ", @cmd_stack, ">/dev/null");
++            $result = system(@cmd_stack);
+             
+             if ($result != 0) {
+                 bail("Unmount LVM snapshot failed: $result");
+@@ -3745,7 +3743,9 @@ sub rsync_backup_point {
+         
+         print_cmd(@cmd_stack);
+         if (0 == $test) {
+-            $result = system(@cmd_stack);
++            # silence gratuitous lvremove output
++            #$result = system(@cmd_stack);
++            $result = system(join " ", @cmd_stack, ">/dev/null");
+             
+             if ($result != 0) {
+                 bail("Removal of LVM snapshot failed: $result");
diff --git a/rsnapshot.spec b/rsnapshot.spec
index 0275cc3..0731174 100644
--- a/rsnapshot.spec
+++ b/rsnapshot.spec
@@ -6,7 +6,7 @@
 
 Name:           rsnapshot
 Version:        1.3.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Local and remote filesystem snapshot utility
 Group:          Applications/System
 License:        GPLv2+
@@ -21,6 +21,9 @@ Patch1:         rsnapshot-fix-include-conf.patch
 # Fixes a =back missing in the POD.  also addressed upstream in post 1.3.1
 #  so once new version comes out this can go away
 Patch2:         pod2man.patch
+# fixes lvremove quiet handling.  already in upstream:
+#  https://github.com/DrHyde/rsnapshot/commit/48efe7edee59a6b38504d0e75a41ba3e396b0c7e
+Patch3:         lvm-quiet.patch
 BuildRequires:  rsync
 BuildRequires:  openssh-clients
 Requires:       openssh-clients
@@ -35,6 +38,7 @@ filesystems.  It uses hard links to save space on disk.
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1 -b .pod2man
+%patch3 -p1 -b .lvm-quiet
 
 # Disable the config-file testing during configure because it freaks out if
 # you're building as non-root on a system that actually has rsnapshot installed.
@@ -93,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 10 2013 Steven Roberts <strobert at strobe.net> - 1.3.1-12
+- added lvm-quiet patch to correct lvremove handling.  bug 1005911
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild