[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    icecream/daemon
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-09-04 12:24:31
Message-ID: 1157372671.266500.18053.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 580767 by mueller:

add workaround for environment install blocking for a while


 M  +7 -3      main.cpp  


--- trunk/icecream/daemon/main.cpp #580766:580767
@@ -640,9 +640,13 @@
     string target = emsg->target;
     if ( target.empty() )
         target =  machine_name;
-    size_t installed_size = install_environment( envbasedir, emsg->target,
-                                                 emsg->name, c, nobody_uid,
-                                                 nobody_gid );
+
+    size_t installed_size = 0;
+    /* HACKALERT: install_environment can block for a while, make sure
+       the scheduler doesn't kick us */
+    if ( maybe_stats(true) )
+        installed_size = install_environment( envbasedir, emsg->target,
+                emsg->name, c, nobody_uid, nobody_gid );
     if (!installed_size) {
         trace() << "install environment failed" << endl;
         c->send_msg(EndMsg()); // shut up, we had an error
[prev in list] [next in list] [prev in thread] [next in thread]