Start hangcheck timer only when not in online-mode.

Package-Manager: portage-2.1.2.7

3 files changed, 23 insertions, 19 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/Manifest b/media-video/noad/Manifest
index d00d3bf0bdf6..17da5a1484f7 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -41,10 +41,10 @@ AUX noad-0.6.0-framesize.diff 414 RMD160 187c4be6c276f878b3e64ad484ee6cb19d7dc3a
 MD5 4c7b14d97e7d4c423e169168ce55d265 files/noad-0.6.0-framesize.diff 414
 RMD160 187c4be6c276f878b3e64ad484ee6cb19d7dc3ad files/noad-0.6.0-framesize.diff 414
 SHA256 f6b7769ef62f5c00de9acb9d5e20fba09c2f745dfb2872405b6780411452eb9f files/noad-0.6.0-framesize.diff 414
-AUX noad-0.6.0-hangcheck.diff 671 RMD160 be58e9ef938381c532fdbe738c3fe3300195e555 SHA1 6136620264761a91bb1f528f972bf9b2ba72618e SHA256 5c671cfff0c41ce2c2a7c757a0d2964341c0d6f9374574ded8c010cceb93ce6f
-MD5 988692a55b0b2345b763a2b66ab00c78 files/noad-0.6.0-hangcheck.diff 671
-RMD160 be58e9ef938381c532fdbe738c3fe3300195e555 files/noad-0.6.0-hangcheck.diff 671
-SHA256 5c671cfff0c41ce2c2a7c757a0d2964341c0d6f9374574ded8c010cceb93ce6f files/noad-0.6.0-hangcheck.diff 671
+AUX noad-0.6.0-hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 SHA1 1dd89e80e32ef30ee4692eb05c3b63da431be3e7 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46
+MD5 450e7937a41c390c99a792cc9fafb70a files/noad-0.6.0-hangcheck.diff 617
+RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 files/noad-0.6.0-hangcheck.diff 617
+SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46 files/noad-0.6.0-hangcheck.diff 617
 DIST noad-0.6.0.tar.bz2 151369 RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd SHA1 21ade875f92b5f3a24456fbf6897634966bb0286 SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183
 EBUILD noad-0.6.0-r7.ebuild 2076 RMD160 24ce14c95c1fb50e0fa0826710e114ab6d5df570 SHA1 f9667d2b32a6de5830bab693ba55d7fa133f929d SHA256 eb8a3b0e74488225369bf702fcae405a0220d9a27a1f62c0820b36ba7b76505a
 MD5 74569dd8bb0b61f754801ffa33d3a1eb noad-0.6.0-r7.ebuild 2076
@@ -54,10 +54,10 @@ EBUILD noad-0.6.0-r8.ebuild 2218 RMD160 411a8b68934210588dedfadb577816b1d120b3a7
 MD5 31bd78216f144f5dee1d43cb2e82fdc1 noad-0.6.0-r8.ebuild 2218
 RMD160 411a8b68934210588dedfadb577816b1d120b3a7 noad-0.6.0-r8.ebuild 2218
 SHA256 2c44d37566694bccfaf19b06dcb05d67f01f1d4bf46dd9f1d8b453bb87f68878 noad-0.6.0-r8.ebuild 2218
-MISC ChangeLog 4942 RMD160 76dd306fa4bcbe1ef1d3c2459e91143325ef7931 SHA1 481b9f5992a92689848684c433d1e4f7dc458358 SHA256 91b22672c68fe106c85ba400f058d96e32ad5aadf41469a9c0e426649cea74cb
-MD5 77d7f2b135042e380fd589fac3ca77fc ChangeLog 4942
-RMD160 76dd306fa4bcbe1ef1d3c2459e91143325ef7931 ChangeLog 4942
-SHA256 91b22672c68fe106c85ba400f058d96e32ad5aadf41469a9c0e426649cea74cb ChangeLog 4942
+MISC ChangeLog 5085 RMD160 108dccde72e4c420eabeb6d965d110914b1fdf60 SHA1 8af7e1db38c9014ee6020ac71324ddb5a4d1e6c5 SHA256 fae3c7d52be3a368ce28e507383dfda0fd53286e98a8642dd22c4a9769d85d03
+MD5 5f1eb8290ce5eba43a03b75400107d2b ChangeLog 5085
+RMD160 108dccde72e4c420eabeb6d965d110914b1fdf60 ChangeLog 5085
+SHA256 fae3c7d52be3a368ce28e507383dfda0fd53286e98a8642dd22c4a9769d85d03 ChangeLog 5085
 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4
 MD5 0dac6cdf92af4c49732fb6ac660b2132 metadata.xml 345
 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 metadata.xml 345
@@ -71,7 +71,7 @@ SHA256 57903a89cf74860cf7d8e58b307d50def06a591c47a6b947506fe1fef60791c7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGRePyt2vP6XvVdOcRAkXoAKCU/nzxQrx6JtgtNBpTu3HR+EqxsgCffRXI
-WPGVfiqEogL55JkE2xp/wu4=
-=RtuY
+iD8DBQFGRemvt2vP6XvVdOcRAuC7AKCY+UiCGkL2QxHzdCKLkRTJRPNgPACfW974
+w95B7Pr22NTHOlESEnvkaPg=
+=gd9u
 -----END PGP SIGNATURE-----
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);