Merge lp:~aptdaemon-developers/python-apt/fix-cannot-locate-file into lp:~mvo/python-apt/debian-sid-mirrored

[Sebastian Heinlein]

Highly requested fix for aptdaemon hanging on cancelled debconf questions!

[Michael Vogt (mvo)]

Thanks a lot for finding this bug! I think the fix is not ideal as it will init the depcache twice,
we probably want to export pkgApplyStatus instead.

The code in python-apt cache.cc creates a new pkgCacheFile() and runs Open() on that which will in
turn run pkgDepCache.init(). But it will not run "pkgApplyStatus()" (maybe it should?).

[Michael Vogt (mvo)]

I think this commit here:
http://bazaar.launchpad.net/~mvo/python-apt/mvo/revision/600
will have the same effect without the need to call "Init()" twice, if you could help me how to reproduce
the actual error I'm happy to merge it and create a python-apt regression test. For some reason the test
inside aptdaemon does not fail for me, even without a updated python-apt :/

[Sebastian Heinlein (glatzor)]

Hello Michael,

Attached is a regression test for python-apt: It needs to be copied to
the tests directory since it re-uses the test-repo.

Cheers,

Sebastian

[lp:~aptdaemon-developers/python-apt/fix-cannot-locate-file]

583. By Sebastian Heinlein on 2012-04-17

Add a regression test

=== modified file 'apt/cache.py'
--- apt/cache.py	2012-03-28 08:19:51 +0000
+++ apt/cache.py	2012-04-17 18:39:19 +0000
@@ -144,6 +144,7 @@
 
         self._cache = apt_pkg.Cache(progress)
         self._depcache = apt_pkg.DepCache(self._cache)
+        self._depcache.init(progress)
         self._records = apt_pkg.PackageRecords(self._cache)
         self._list = apt_pkg.SourceList()
         self._list.read_main_list()

=== modified file 'python/depcache.cc'
--- python/depcache.cc	2011-11-10 16:20:58 +0000
+++ python/depcache.cc	2012-04-17 18:39:19 +0000
@@ -568,8 +568,7 @@
 {
    {"init",PkgDepCacheInit,METH_VARARGS,
     "init(progress: apt.progress.base.OpProgress)\n\n"
-    "Initialize the depcache (done automatically when constructing\n"
-    "the object)."},
+    "Initialize the depcache."},
    {"get_candidate_ver",PkgDepCacheGetCandidateVer,METH_VARARGS,
     "get_candidate_ver(pkg: apt_pkg.Package) -> apt_pkg.Version\n\n"
     "Return the candidate version for the package, normally the version\n"

=== added file 'tests/test_lp659438.py'
--- tests/test_lp659438.py	1970-01-01 00:00:00 +0000
+++ tests/test_lp659438.py	2012-04-17 18:39:19 +0000
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""Regression test for LP: #981896, LP: #659438"""
+# Copyright (C) 2012 Sebastian Heinlein <[e-mail]>
+#
+# Licensed under the GNU General Public License Version 2
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Licensed under the GNU General Public License Version 2
+
+__author__  = "Sebastian Heinlein <[e-mail]>"
+
+import os
+import shutil
+import tempfile
+import unittest
+
+import apt_pkg
+import apt
+
+
+class RegressionTestCase(unittest.TestCase):
+
+    """Test suite for LP: #981896, LP: #659438
+    'Cannot locate a file for package X'
+    """
+
+    def setUp(self):
+        apt_pkg.init_config()
+        chroot_path = tempfile.mkdtemp()
+        self.addCleanup(lambda: shutil.rmtree(chroot_path))
+        # Create a damaged status file
+        self.cache = apt.cache.Cache(rootdir=chroot_path)
+        with open(apt_pkg.config.find_file("Dir::State::status"),
+                  "a") as status:
+            status.write("""Package: abrowser
+Status: install reinstreq half-installed
+Priority: optional
+Section: admin
+Version: 3.6.9+build1+nobinonly-0ubuntu1""")
+        sources_list_path = apt_pkg.config.find_file("Dir::Etc::sourcelist")
+        repo_path = os.path.abspath("./data/test-repo")
+        with open(sources_list_path, "w") as sources_list:
+            sources_list.write("deb copy:%s /\n" % repo_path)
+        # os.makedirs(os.path.join(chroot_path, "etc/apt/sources.list.d/"))
+        self.cache.update(sources_list=sources_list_path)
+        self.cache.open()
+
+    def test_survive_reqreinst(self):
+        """Test that we survive a package in require reinstallation state"""
+        self.assertEqual(self.cache.required_download, 82324L)
+
+if __name__ == "__main__":
+    unittest.main()
+
+# vim: ts=4 et sts=4