diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-02-17 17:35:17 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-02-17 17:35:17 +0100 |
| commit | 8c2fa71d625189bf848b32e8da9b6e562751dadc (patch) | |
| tree | 28ca424d3d24e4d1d7638d75eea1e7409712b145 /python/progress.cc | |
| parent | 478a5ebf8c3e7bb4b17981e51d6341309bba3df6 (diff) | |
| download | python-apt-8c2fa71d625189bf848b32e8da9b6e562751dadc.tar.gz | |
python/progress.cc: more compat fixes
Diffstat (limited to 'python/progress.cc')
| -rw-r--r-- | python/progress.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/python/progress.cc b/python/progress.cc index ee8f9348..18081690 100644 --- a/python/progress.cc +++ b/python/progress.cc @@ -415,24 +415,24 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner) void PyInstallProgress::StartUpdate() { - if (!RunSimpleCallback("start_update")) - RunSimpleCallback("startUpdate"); + if (!RunSimpleCallback("startUpdate")) + RunSimpleCallback("start_update"); PyCbObj_BEGIN_ALLOW_THREADS } void PyInstallProgress::UpdateInterface() { PyCbObj_END_ALLOW_THREADS - if (!RunSimpleCallback("update_interface")) - RunSimpleCallback("updateInterface"); + if (!RunSimpleCallback("updateInterface")) + RunSimpleCallback("update_interface"); PyCbObj_BEGIN_ALLOW_THREADS } void PyInstallProgress::FinishUpdate() { PyCbObj_END_ALLOW_THREADS - if (!RunSimpleCallback("finish_update")) - RunSimpleCallback("finishUpdate"); + if (!RunSimpleCallback("finishUpdate")) + RunSimpleCallback("finish_update"); } pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm) @@ -575,7 +575,7 @@ bool PyCdromProgress::AskCdromName(string &Name) // Old style: (True, name) on success, (False, name) on failure. if (PyObject_HasAttrString(callbackInst, "askAdromName")) { - RunSimpleCallback("ask_cdrom_name", arglist, &result); + RunSimpleCallback("askAdromName", arglist, &result); if(!PyArg_Parse(result, "(bs)", &res, &new_name)) std::cerr << "AskCdromName: result could not be parsed" << std::endl; // set the new name @@ -588,7 +588,7 @@ bool PyCdromProgress::AskCdromName(string &Name) if(result == Py_None) return false; if(!PyArg_Parse(result, "s", &new_name)) - std::cerr << "AskCdromName: result could not be parsed" << std::endl; + std::cerr << "ask_cdrom_name: result could not be parsed" << std::endl; else Name = string(new_name); return true; |
