diff options
| author | Julian Andres Klode <jak@debian.org> | 2010-12-12 14:26:26 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2010-12-12 14:26:26 +0100 |
| commit | 88cbcaa5a0fcffd319004b85287f0de42f622571 (patch) | |
| tree | 05db30be0c16f1b58c3ff8f1e4b2dd8a5d3c3eb7 /python/depcache.cc | |
| parent | eca74f2d3cdfc32ac9c8daeb50bba70da8590d91 (diff) | |
| parent | 6a05a8302c405c4c8d1b59f6be8c2d0974c6ce1e (diff) | |
| download | python-apt-88cbcaa5a0fcffd319004b85287f0de42f622571.tar.gz | |
Merge from mvo
* python/generic.h:
- set Object to NULL in CppDeallocPtr
* python/depcache.cc:
- don't run "actiongroup.release()" if the object was already
deallocated
* tests/test_apt_cache.py:
- fix tests to work if apt compressed indexes are enabled
Diffstat (limited to 'python/depcache.cc')
| -rw-r--r-- | python/depcache.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/depcache.cc b/python/depcache.cc index b7294644..014ad7ae 100644 --- a/python/depcache.cc +++ b/python/depcache.cc @@ -997,7 +997,8 @@ static const char *actiongroup__exit__doc = "Same as release(), but for use as a context manager."; static PyObject *PkgActionGroupExit(PyObject *Self,PyObject *Args) { pkgDepCache::ActionGroup *ag = GetCpp<pkgDepCache::ActionGroup*>(Self); - ag->release(); + if (ag != NULL) + ag->release(); Py_RETURN_FALSE; } |