Merged Michael's changes

5 files changed, 25 insertions, 8 deletions

diff --git a/python/apt_instmodule.cc b/python/apt_instmodule.cc
index 43d5e7f7..ea703b21 100644
--- a/python/apt_instmodule.cc
+++ b/python/apt_instmodule.cc
@@ -74,6 +74,7 @@ static char *doc_debExtractArchive =
 static PyObject *debExtractArchive(PyObject *Self,PyObject *Args)
 {
    char *Rootdir = NULL;
+   char cwd[512];
    PyObject *File;
    if (PyArg_ParseTuple(Args,"O!|s",&PyFile_Type,&File,&Rootdir) == 0)
       return 0;
@@ -83,21 +84,27 @@ static PyObject *debExtractArchive(PyObject *Self,PyObject *Args)
    {
       if(Rootdir != NULL) 
       {
+	 getcwd(cwd, sizeof(cwd));
 	 chdir(Rootdir);
       }
 
       // Open the file and associate the .deb
       FileFd Fd(fileno(PyFile_AsFile(File)),false);
       debDebFile Deb(Fd);
-      if (_error->PendingError() == true)
-	 return HandleErrors();
+      if (_error->PendingError() == true) {
+	 if (Rootdir != NULL)
+	    chdir (cwd);
+	 return HandleErrors(Py_BuildValue("b",false));
+      }
 
       // extracts relative to the current dir
       pkgDirStream Extract;
       res = Deb.ExtractArchive(Extract);
 
+      if (Rootdir != NULL)
+	 chdir (cwd);
       if (res == false)
-	 return HandleErrors();
+	 return HandleErrors(Py_BuildValue("b",res));
    }   
    return HandleErrors(Py_BuildValue("b",res));
 }
diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index fd7a83cd..fae85f00 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -517,6 +517,12 @@ extern "C" void initapt_pkg()
    AddInt(Dict,"CurStateConfigFiles",pkgCache::State::ConfigFiles);
    AddInt(Dict,"CurStateInstalled",pkgCache::State::Installed);
 
+   AddInt(Dict,"SelStateUnknown",pkgCache::State::Unknown);
+   AddInt(Dict,"SelStateInstall",pkgCache::State::Install);
+   AddInt(Dict,"SelStateHold",pkgCache::State::Hold);
+   AddInt(Dict,"SelStateDeInstall",pkgCache::State::DeInstall);
+   AddInt(Dict,"SelStatePurge",pkgCache::State::Purge);
+
    AddInt(Dict,"InstStateOk",pkgCache::State::Ok);
    AddInt(Dict,"InstStateReInstReq",pkgCache::State::ReInstReq);
    AddInt(Dict,"InstStateHold",pkgCache::State::Hold);
diff --git a/python/cache.cc b/python/cache.cc
index 66a2c5d9..bd280dec 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -599,7 +599,7 @@ static PyObject *VersionAttr(PyObject *Self,char *Name)
    else if (strcmp("Priority",Name) == 0)
       return Py_BuildValue("i",Ver->Priority);
    else if (strcmp("PriorityStr",Name) == 0)
-      return PyString_FromString(Ver.PriorityType());
+      return Safe_FromString(Ver.PriorityType());
    else if (strcmp("Downloadable", Name) == 0)
       return Py_BuildValue("b", Ver.Downloadable());
    else if (strcmp("TranslatedDescription", Name) == 0) {
diff --git a/python/depcache.cc b/python/depcache.cc
index 5664a6d8..2446dc71 100644
--- a/python/depcache.cc
+++ b/python/depcache.cc
@@ -197,7 +197,7 @@ static PyObject *PkgDepCacheSetCandidateVer(PyObject *Self,PyObject *Args)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
-   pkgCache::VerIterator I = GetCpp<pkgCache::VerIterator>(VersionObj);
+   pkgCache::VerIterator &I = GetCpp<pkgCache::VerIterator>(VersionObj);
    if(I.end()) {
       return HandleErrors(Py_BuildValue("b",false));
    }
@@ -215,7 +215,9 @@ static PyObject *PkgDepCacheGetCandidateVer(PyObject *Self,PyObject *Args)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
-   pkgCache::VerIterator I = depcache->GetCandidateVer(Pkg);
+   pkgDepCache::StateCache & State = (*depcache)[Pkg];
+   pkgCache::VerIterator I = State.CandidateVerIter(*depcache);
+
    if(I.end()) {
       Py_INCREF(Py_None);
       return Py_None;
diff --git a/python/progress.cc b/python/progress.cc
index 793265db..99ad0a25 100644
--- a/python/progress.cc
+++ b/python/progress.cc
@@ -185,8 +185,10 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner)
    bool res = true;
    if(!PyArg_Parse(result, "b", &res)) 
    {
-      // mvo: this is harmless, we shouldn't print anything here
-      //std::cerr << "result could not be parsed" << std::endl;
+      // most of the time the user who subclasses the pulse() 
+      // method forgot to add a return {True,False} so we just
+      // assume he wants a True
+      return true;
    }
 
    // fetching can be canceld by returning false