diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2007-05-12 16:22:01 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2007-05-12 16:22:01 +0000 |
| commit | 84e9dc2ec8e041a2084810ac78825b1d713b669c (patch) | |
| tree | 19a2c03734ef672f97a7429f635ffa0f4f7709a0 /media-video | |
| parent | Removing old version which was stable for m68k, but as no m68k-arch-alias exi... (diff) | |
| download | gentoo-2-84e9dc2ec8e041a2084810ac78825b1d713b669c.tar.gz gentoo-2-84e9dc2ec8e041a2084810ac78825b1d713b669c.tar.bz2 gentoo-2-84e9dc2ec8e041a2084810ac78825b1d713b669c.zip | |
Start hangcheck timer only when not in online-mode.
(Portage version: 2.1.2.7)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/noad/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/noad/files/noad-0.6.0-hangcheck.diff | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog index 7ae094ec18d5..67bb70bc78d0 100644 --- a/media-video/noad/ChangeLog +++ b/media-video/noad/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/noad # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.22 2007/05/12 15:57:31 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.23 2007/05/12 16:22:01 zzam Exp $ + + 12 May 2007; Matthias Schwarzott <zzam@gentoo.org> + files/noad-0.6.0-hangcheck.diff: + Start hangcheck timer only when not in online-mode. *noad-0.6.0-r8 (12 May 2007) diff --git a/media-video/noad/files/noad-0.6.0-hangcheck.diff b/media-video/noad/files/noad-0.6.0-hangcheck.diff index c7383c715450..37788a197fd7 100644 --- a/media-video/noad/files/noad-0.6.0-hangcheck.diff +++ b/media-video/noad/files/noad-0.6.0-hangcheck.diff @@ -1,10 +1,7 @@ -Nur in noad-0.6.0: confdefs.h. -Nur in noad-0.6.0: config.log. -Nur in noad-0.6.0: conftest.cc. diff -ru noad-0.6.0-orig/main.cpp noad-0.6.0/main.cpp --- noad-0.6.0-orig/main.cpp 2007-05-12 17:28:01.000000000 +0200 -+++ noad-0.6.0/main.cpp 2007-05-12 17:31:51.000000000 +0200 -@@ -566,10 +566,14 @@ ++++ noad-0.6.0/main.cpp 2007-05-12 18:20:30.000000000 +0200 +@@ -566,10 +566,17 @@ signal(SIGABRT, signal_handler); signal(SIGSEGV, signal_handler); signal(SIGUSR1, signal_handler); @@ -14,8 +11,11 @@ diff -ru noad-0.6.0-orig/main.cpp noad-0.6.0/main.cpp atexit(cleanUp); + -+ // now start alarm timer to kill hanging noad (hardcoded 30min timeout) -+ alarm(30*60); ++ if (!bOnline) { ++ // now start alarm timer to kill hanging noad (hardcoded 30min timeout) ++ alarm(30*60); ++ } ++ // now do the work.., doNoad(bBefore, recDir); |