diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-11-22 09:04:05 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-11-22 09:04:05 +0000 |
| commit | c26431eebbd6d9b90bba2498355e1874a15aba60 (patch) | |
| tree | 4eca34ae3fc50f1857191fdc56449e4f96d75ec6 | |
| parent | a9d234dfe2ab0358d3e61a53645e4ee1d83e53cb (diff) | |
| download | python-apt-c26431eebbd6d9b90bba2498355e1874a15aba60.tar.gz | |
* less debug messages
| -rw-r--r-- | python/cache.cc | 2 | ||||
| -rw-r--r-- | python/depcache.cc | 6 | ||||
| -rw-r--r-- | python/progress.cc | 11 |
3 files changed, 9 insertions, 10 deletions
diff --git a/python/cache.cc b/python/cache.cc index 5c1760d4..5e2d9819 100644 --- a/python/cache.cc +++ b/python/cache.cc @@ -637,8 +637,6 @@ static PyObject *PackageFileAttr(PyObject *Self,char *Name) return Py_BuildValue("i",(File->Flags & pkgCache::Flag::NotAutomatic) != 0); else if (strcmp("ID",Name) == 0) return Py_BuildValue("i",File->ID); - /* mtime is really a cookie these days and has no meaning outside the - list handlers */ PyErr_SetString(PyExc_AttributeError,Name); return 0; diff --git a/python/depcache.cc b/python/depcache.cc index 6d5e9fcd..51c25080 100644 --- a/python/depcache.cc +++ b/python/depcache.cc @@ -160,16 +160,16 @@ static PyObject *PkgDepCacheCommit(PyObject *Self,PyObject *Args) //FIXME: make this more flexible, e.g. with a failedDl handler if(Failed) return Py_BuildValue("b", false); - _system->UnLock(); + _system->UnLock(true); pkgPackageManager::OrderResult Res = iprogress.Run(PM); //std::cout << "iprogress.Run() returned: " << (int)Res << std::endl; - //FIXME: return usefull values here if (Res == pkgPackageManager::Failed || _error->PendingError() == true) { - return Py_BuildValue("b", false); + return HandleErrors(Py_BuildValue("b", false)); } if (Res == pkgPackageManager::Completed) { + //std::cout << "iprogress.Run() returned Completed " << std::endl; return Py_BuildValue("b", true); } diff --git a/python/progress.cc b/python/progress.cc index 61343a0b..d0c97839 100644 --- a/python/progress.cc +++ b/python/progress.cc @@ -233,7 +233,7 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm) } 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(); } @@ -253,7 +253,7 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm) } else { res = pm->DoInstall(); } - std::cout << "res: " << res << std::endl; + //std::cout << "res: " << res << std::endl; _exit(res); } @@ -262,7 +262,7 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm) if(PyObject_HasAttrString(callbackInst, "waitChild")) { PyObject *method = PyObject_GetAttrString(callbackInst, "waitChild"); - std::cerr << "custom waitChild found" << std::endl; + //std::cerr << "custom waitChild found" << std::endl; PyObject *arglist = Py_BuildValue("(i)",child_id); PyObject *result = PyEval_CallObject(method, arglist); Py_DECREF(arglist); @@ -276,14 +276,15 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm) std::cerr << "custom waitChild() result could not be parsed?"<< std::endl; return pkgPackageManager::Failed; } - std::cerr << "got child_res: " << res << std::endl; + //std::cerr << "got child_res: " << res << std::endl; } else { - std::cerr << "using build-in waitpid()" << std::endl; + //std::cerr << "using build-in waitpid()" << std::endl; while (waitpid(child_id, &ret, WNOHANG) == 0) UpdateInterface(); res = (pkgPackageManager::OrderResult) WEXITSTATUS(ret); + //std::cerr << "build-in waitpid() got: " << res << std::endl; } FinishUpdate(); |
