[oe-commits] Jackie Huang : eject: Fix wrong return value

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 360aa3f0980fbf8985a98f6bfbeb058e3d7aaedd
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=360aa3f0980fbf8985a98f6bfbeb058e3d7aaedd

Author: Jackie Huang <jackie.huang at windriver.com>
Date:   Wed Apr  9 14:27:09 2014 +0800

eject: Fix wrong return value

Remove the unnecessary return(1) from function usage(), so that eject -h
can return the right value.

Signed-off-by: Zhangle Yang <zhangle.yang at windriver.com>
Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../recipes-support/eject/eject/eject-2.1.5-error-return.patch | 10 ++++++++++
 meta-oe/recipes-support/eject/eject_2.1.5.bb                   |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/eject/eject/eject-2.1.5-error-return.patch b/meta-oe/recipes-support/eject/eject/eject-2.1.5-error-return.patch
new file mode 100644
index 0000000..2cce3c3
--- /dev/null
+++ b/meta-oe/recipes-support/eject/eject/eject-2.1.5-error-return.patch
@@ -0,0 +1,10 @@
+Upstream-Status: Pending
+
+--- eject/eject.c.orig	2013-09-11 18:08:36.000000000 +0800
++++ eject/eject.c	2013-09-11 18:09:05.000000000 +0800
+@@ -207,7 +207,6 @@
+ "If omitted, name defaults to `%s'.\n"
+ "By default tries -r, -s, -f, and -q in order until success.\n"),
+ 			DEFAULTDEVICE);
+-  exit(1);
+ }
diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
index 98319a3..c47c653 100644
--- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
+++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
@@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
 inherit autotools gettext update-alternatives
 
-SRC_URI = "http://sources.openembedded.org/${BP}.tar.gz"
+SRC_URI = "http://sources.openembedded.org/${BP}.tar.gz \
+           file://eject-2.1.5-error-return.patch \
+"
 
 SRC_URI[md5sum] = "b96a6d4263122f1711db12701d79f738"
 SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55"