[Dmraid-debian-commits] [SCM] Maintenance of the dmraid package branch, master, updated. debian/1.0.0.rc15-1.exp3-1-ge41f5e6

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit e41f5e6c8d435808a396d3e5d12b7e5c1987fe3d
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date:   Fri Dec 26 20:41:40 2008 +0100

    debian/patches/10_exit_code.dpatch: Fix exit-code for "No RAID disks" and "no block devices found" errors (LP: #300825)

diff --git a/debian/patches/00list b/debian/patches/00list
index 75a4570..834dd71 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -6,4 +6,5 @@
 06_fix_led_support_compilation.dpatch
 07_fix_dmraid_mini_build.dpatch
 09_promise-add-offsets.dpatch
+10_exit_code.dpatch
 12_support_virtio_devices.dpatch
diff --git a/debian/patches/10_exit_code.dpatch b/debian/patches/10_exit_code.dpatch
new file mode 100755
index 0000000..ac3e57d
--- /dev/null
+++ b/debian/patches/10_exit_code.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_exit_code.dpatch by Giuseppe Iuculano <giuseppe at iuculano.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix exit-code for "No RAID disks" and "no block devices found" errors (LP: #300825)
+
+ at DPATCH@
+diff -urNad dmraid.git~/1.0.0.rc15/lib/metadata/metadata.c dmraid.git/1.0.0.rc15/lib/metadata/metadata.c
+--- dmraid.git~/1.0.0.rc15/lib/metadata/metadata.c	2008-12-26 20:12:32.000000000 +0100
++++ dmraid.git/1.0.0.rc15/lib/metadata/metadata.c	2008-12-26 20:37:27.000000000 +0100
+@@ -2092,7 +2092,7 @@
+ 
+ 	if (!count_devices(lc, DEVICE)) {
+ 		log_print(lc, "no block devices found");
+-		return 1;
++		return 0;
+ 	}
+ 
+ 	if (!(M_RAID & p->metadata))
+@@ -2114,7 +2114,7 @@
+ 	if (!OPT_HOT_SPARE_SET(lc) && !OPT_CREATE(lc)
+ 	    && !count_devices(lc, RAID)) {
+ 		format_error(lc, "disks", argv);
+-		return 1;
++		return 0;
+ 	}
+ 
+ 	if (M_SET & p->metadata) {

-- 
Maintenance of the dmraid package