* custom waitChild() added in installProgress

1 files changed, 32 insertions, 7 deletions

diff --git a/python/progress.cc b/python/progress.cc
index 12f9c7a8..61343a0b 100644
--- a/python/progress.cc
+++ b/python/progress.cc
@@ -218,7 +218,7 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm)
    // support custom fork methods
    if(PyObject_HasAttrString(callbackInst, "fork")) {
       PyObject *method = PyObject_GetAttrString(callbackInst, "fork");
-      //std::cerr << "custom fork found" << std::endl;
+      std::cerr << "custom fork found" << std::endl;
       PyObject *arglist = Py_BuildValue("()");
       PyObject *result = PyEval_CallObject(method, arglist);
       Py_DECREF(arglist);       
@@ -227,11 +227,13 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm)
 	 PyErr_Print();
 	 return pkgPackageManager::Failed;
       }
-      if(!PyArg_Parse(result, "i", &child_id) )
+      if(!PyArg_Parse(result, "i", &child_id) ) {
 	 std::cerr << "custom fork() result could not be parsed?"<< std::endl;
-      //std::cerr << "got: " << child_id << std::endl;
+	 return pkgPackageManager::Failed;
+      }
+      std::cerr << "got pid: " << child_id << std::endl;
    } else {
-      //std::cerr << "using build-in fork()" << std::endl;
+      std::cerr << "using build-in fork()" << std::endl;
       child_id = fork();
    }
    
@@ -251,15 +253,38 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm)
       } else {
 	 res = pm->DoInstall();
       }
+      std::cout << "res: " << res << std::endl;
       _exit(res);
    }
 
 
    StartUpdate();
-   while (waitpid(child_id, &ret, WNOHANG) == 0)
-      UpdateInterface();
 
-   res = (pkgPackageManager::OrderResult) WEXITSTATUS(ret);
+   if(PyObject_HasAttrString(callbackInst, "waitChild")) {
+      PyObject *method = PyObject_GetAttrString(callbackInst, "waitChild");
+      std::cerr << "custom waitChild found" << std::endl;
+      PyObject *arglist = Py_BuildValue("(i)",child_id);
+      PyObject *result = PyEval_CallObject(method, arglist);
+      Py_DECREF(arglist);       
+      if (result == NULL) {
+	 std::cerr << "waitChild method invalid" << std::endl;
+	 PyErr_Print();
+	 return pkgPackageManager::Failed;
+      }
+      int child_res;
+      if(!PyArg_Parse(result, "i", &res) ) {
+	 std::cerr << "custom waitChild() result could not be parsed?"<< std::endl;
+	 return pkgPackageManager::Failed;
+      }
+      std::cerr << "got child_res: " << res << std::endl;
+   } else {
+      std::cerr << "using build-in waitpid()" << std::endl;
+      
+      while (waitpid(child_id, &ret, WNOHANG) == 0)
+	 UpdateInterface();
+
+      res = (pkgPackageManager::OrderResult) WEXITSTATUS(ret);
+   }
 
    FinishUpdate();