1 files changed, 6 insertions, 27 deletions
diff --git a/python/depcache.cc b/python/depcache.cc
index 73993c82..c9dc79f3 100644
--- a/python/depcache.cc
+++ b/python/depcache.cc
@@ -89,9 +89,11 @@ static PyObject *PkgDepCacheCommit(PyObject *Self,PyObject *Args)
    PyFetchProgress progress;
    progress.setCallbackInst(pyFetchProgressInst);
 
-   pkgAcquire Fetcher(&progress);
+   pkgAcquire Fetcher;
    pkgPackageManager *PM;
    PM = _system->CreatePM(depcache);
+
+   Fetcher.Setup(&progress);
    if(PM->GetArchives(&Fetcher, &List, &Recs) == false ||
       _error->PendingError() == true) {
       std::cerr << "Error in GetArchives" << std::endl;
@@ -109,7 +111,7 @@ static PyObject *PkgDepCacheCommit(PyObject *Self,PyObject *Args)
       bool Transient = false;
 
       if (Fetcher.Run() == pkgAcquire::Failed)
-	 return false;
+	 return HandleErrors();
 
       // Print out errors
       bool Failed = false;
@@ -794,14 +796,6 @@ PyTypeObject PyDepCache_Type =
    PkgDepCacheNew,                      // tp_new
 };
 
-#ifdef COMPAT_0_7
-PyObject *GetDepCache(PyObject *Self,PyObject *Args)
-{
-    PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetDepCache() is deprecated"
-                 ". Please see apt_pkg.DepCache() for the replacement.",1);
-    return PkgDepCacheNew(&PyDepCache_Type,Args,0);
-}
-#endif
 
 
 
@@ -829,14 +823,6 @@ static PyObject *PkgProblemResolverNew(PyTypeObject *type,PyObject *Args,PyObjec
    return PkgProblemResolverPyObj;
 }
 
-#ifdef COMPAT_0_7
-PyObject *GetPkgProblemResolver(PyObject *Self,PyObject *Args) {
-    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgProblemResolver() is"
-                 " deprecated. Please see apt_pkg.ProblemResolver() for the "
-                 "replacement.", 1);
-    return PkgProblemResolverNew(&PyProblemResolver_Type,Args,0);
-}
-#endif
 
 static PyObject *PkgProblemResolverResolve(PyObject *Self,PyObject *Args)
 {
@@ -909,7 +895,9 @@ static PyObject *PkgProblemResolverInstallProtect(PyObject *Self,PyObject *Args)
    pkgProblemResolver *fixer = GetCpp<pkgProblemResolver *>(Self);
    if (PyArg_ParseTuple(Args,"") == 0)
       return 0;
+   PY_APT_BEGIN_DEPRECATED;
    fixer->InstallProtect();
+   PY_APT_END_DEPRECATED;
    Py_INCREF(Py_None);
    return HandleErrors(Py_None);
 }
@@ -1121,15 +1109,6 @@ PyTypeObject PyActionGroup_Type =
    PkgActionGroupNew,                   // tp_new
 };
 
-#ifdef COMPAT_0_7
-PyObject *GetPkgActionGroup(PyObject *Self,PyObject *Args)
-{
-    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgActionGroup() is "
-                 "deprecated. Please see apt_pkg.ActionGroup() for the "
-                 "replacement.", 1);
-    return PkgActionGroupNew(&PyActionGroup_Type,Args,0);
-}
-#endif
 
 
 									/*}}}*/