rpms/dvgrab/devel dvgrab-3.4-set-proper-retval-on-failure.patch, NONE, 1.1 dvgrab.spec, 1.31, 1.32

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/dvgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1588

Modified Files:
	dvgrab.spec 
Added Files:
	dvgrab-3.4-set-proper-retval-on-failure.patch 
Log Message:
* Thu Mar 19 2009 Jarod Wilson <jarod at redhat.com> - 3.4-2
- Set retval to 1 if we get an error, to make life easier for folks
  who wrap dvgrab to tell if something went wrong (#486061).


dvgrab-3.4-set-proper-retval-on-failure.patch:

--- NEW FILE dvgrab-3.4-set-proper-retval-on-failure.patch ---
Set retval to 1 if we get an error, to make life easier for folks
who wrap dvgrab to tell if something went wrong (rhbz #486061).

Signed-off-by: Jarod Wilson <jarod at redhat.com>

--- dvgrab-3.4/main.cc.orig	2009-03-19 16:12:55.417171454 -0400
+++ dvgrab-3.4/main.cc	2009-03-19 16:12:22.321109256 -0400
@@ -93,6 +93,8 @@ int rt_raisepri (int pri)
 
 int main( int argc, char *argv[] )
 {
+	int ret = 0;
+
 	fcntl( fileno( stderr ), F_SETFL, O_NONBLOCK );
 	try
 	{
@@ -137,13 +139,15 @@ int main( int argc, char *argv[] )
 	{
 		fprintf( stderr, "Error: %s\n", s.c_str() );
 		fflush( stderr );
+		ret = 1;
 	}
 	catch ( ... )
 	{
 		fprintf( stderr, "Error: unknown\n" );
 		fflush( stderr );
+		ret = 1;
 	}
 
 	fprintf( stderr, "\n" );
-	return 0;
+	return ret;
 }


Index: dvgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvgrab/devel/dvgrab.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- dvgrab.spec	24 Feb 2009 15:14:37 -0000	1.31
+++ dvgrab.spec	19 Mar 2009 20:26:05 -0000	1.32
@@ -1,12 +1,13 @@
 Summary:        Utility to capture video from a DV camera
 Name:           dvgrab
 Version:        3.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.kinodv.org/
 Source:         http://dl.sf.net/kino/dvgrab-%{version}.tar.gz
 Patch0:         dvgrab-3.3-fix-gcc-4.4-build.patch
+Patch1:         dvgrab-3.4-set-proper-retval-on-failure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libraw1394-devel libavc1394-devel libdv-devel
 BuildRequires:  libiec61883-devel libjpeg-devel
@@ -19,6 +20,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -38,6 +40,10 @@
 %{_mandir}/man1/dvgrab.1*
 
 %changelog
+* Thu Mar 19 2009 Jarod Wilson <jarod at redhat.com> - 3.4-2
+- Set retval to 1 if we get an error, to make life easier for folks
+  who wrap dvgrab to tell if something went wrong (#486061).
+
 * Tue Feb 24 2009 Jarod Wilson <jarod at redhat.com> - 3.4-1
 - New upstream release, v3.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild