From 0d616ec4ef49064412b27275dbbb1cb04b546fb5 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Wed, 23 Oct 2013 19:27:10 +0200
Subject: python/*.cc: Get rid of the easy-to-replace deprecated APT functions

We cannot get rid of the InstallProtect and StrToTime calls for backwards
compatibility, but let's drop the others.
---
 python/apt_pkgmodule.cc | 2 +-
 python/cache.cc         | 6 +++---
 python/depcache.cc      | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'python')

diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index a3916021..644827c3 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -21,7 +21,7 @@
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
-#include <apt-pkg/sha256.h>
+#include <apt-pkg/sha2.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/orderlist.h>
diff --git a/python/cache.cc b/python/cache.cc
index 40782838..2fa556e1 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -329,7 +329,7 @@ static PyObject *PkgCacheNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 
    if (pyCallbackInst == Py_None) {
       OpProgress Prog;
-      if (Cache->Open(Prog,false) == false)
+      if (Cache->Open(&Prog,false) == false)
 	     return HandleErrors();
    } else if(pyCallbackInst != 0) {
       // sanity check for the progress object, see #497049
@@ -345,12 +345,12 @@ static PyObject *PkgCacheNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
       }
       PyOpProgress progress;
       progress.setCallbackInst(pyCallbackInst);
-      if (Cache->Open(progress,false) == false)
+      if (Cache->Open(&progress,false) == false)
          return HandleErrors();
    }
    else {
       OpTextProgress Prog;
-      if (Cache->Open(Prog,false) == false)
+      if (Cache->Open(&Prog,false) == false)
 	     return HandleErrors();
    }
 
diff --git a/python/depcache.cc b/python/depcache.cc
index acd41a85..9f4b91b4 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;
-- 
cgit v1.2.3