rpms/lirc/devel lirc-dont-exit.patch,1.1,1.2
Bastien Nocera
hadess at fedoraproject.org
Fri Aug 22 23:30:44 UTC 2008
- Previous message: rpms/mousetweaks/devel .cvsignore, 1.7, 1.8 mousetweaks.spec, 1.10, 1.11 sources, 1.7, 1.8
- Next message: rpms/glabels/F-9 .cvsignore, 1.7, 1.8 glabels.spec, 1.17, 1.18 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: hadess
Update of /cvs/pkgs/rpms/lirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17808
Modified Files:
lirc-dont-exit.patch
Log Message:
Update patch to match upstream
lirc-dont-exit.patch:
Index: lirc-dont-exit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc-dont-exit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lirc-dont-exit.patch 14 Aug 2008 15:41:38 -0000 1.1
+++ lirc-dont-exit.patch 22 Aug 2008 23:30:44 -0000 1.2
@@ -1,20 +1,20 @@
-Index: daemons/lircd.c
-===================================================================
-RCS file: /cvsroot/lirc/lirc/daemons/lircd.c,v
-retrieving revision 5.77
-diff -u -p -u -p -r5.77 lircd.c
---- daemons/lircd.c 9 May 2008 18:40:59 -0000 5.77
-+++ daemons/lircd.c 14 Aug 2008 08:56:50 -0000
-@@ -518,7 +518,11 @@ void add_client(int sock)
- shutdown(clis[0],2);
- close(clis[0]);
- clin=0;
+--- daemons/lircd.c 2008/05/09 18:40:59 5.77
++++ daemons/lircd.c 2008/08/21 18:39:25 5.78
+@@ -515,10 +515,13 @@
+ {
+ if(!hw.init_func())
+ {
+- shutdown(clis[0],2);
+- close(clis[0]);
+- clin=0;
- dosigterm(SIGTERM);
-+ /* Don't exit here, otherwise lirc bails out,
-+ * and lircd exits, making it impossible to
-+ * connect to when we have a device actually
-+ * plugged in.
-+ dosigterm(SIGTERM); */
++ logprintf(LOG_WARNING,
++ "Failed to initialize hardware");
++ /* Don't exit here, otherwise lirc
++ * bails out, and lircd exits, making
++ * it impossible to connect to when we
++ * have a device actually plugged
++ * in. */
}
}
}
- Previous message: rpms/mousetweaks/devel .cvsignore, 1.7, 1.8 mousetweaks.spec, 1.10, 1.11 sources, 1.7, 1.8
- Next message: rpms/glabels/F-9 .cvsignore, 1.7, 1.8 glabels.spec, 1.17, 1.18 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list