Merge lp:~mvo/aptdaemon/fix-702217 into lp:aptdaemon

[Michael Vogt]

This is a fix for bug #702217. It also adds a testcase (that fails with the old code).

The fix by ckorn is probably fine as well (haven't tested it).

[Sebastian Heinlein (glatzor)]

Instead of changing the types I prefer removing the item assignment. Fixed in rev. 595. Thanks a lot!

[Sebastian Heinlein (glatzor)]

review: Disapprove

[Michael Vogt (mvo)]

I mark it as merged to get it off the code.launchpad.net list, its not merged as such, but the test is in and the bug is fixed (in a different way though).

=== modified file 'aptdaemon/core.py'
--- aptdaemon/core.py	2011-02-19 13:40:03 +0000
+++ aptdaemon/core.py	2011-03-07 17:16:01 +0000
@@ -340,9 +340,8 @@
         self._depends = dbus.Struct([dbus.Array([], signature='s') \
                                      for i in range(7)],
                                     signature="asasasasasasas")
-        self._packages = dbus.Struct([dbus.Array(pkgs, signature="s")
-                                      for pkgs in packages],
-                                     signature="asasasasasas")
+        self._packages = dbus.Array([dbus.Array(pkgs, signature="s")
+                                      for pkgs in packages])
         self._unauthenticated = dbus.Array([], signature=dbus.Signature('s'))
         # Add a timeout which removes the transaction from the bus if it
         # hasn't been setup and run for the TRANSACTION_IDLE_TIMEOUT period
 
=== added directory 'tests/debs'
=== added file 'tests/debs/utf8-package_1.0-1_all.deb'
 Binary files tests/debs/utf8-package_1.0-1_all.deb	1970-01-01 00:00:00 +0000 and tests/debs/utf8-package_1.0-1_all.deb	2011-03-07 17:16:01 +0000 differ
=== modified file 'tests/test_worker.py'
--- tests/test_worker.py	2011-02-07 08:11:22 +0000
+++ tests/test_worker.py	2011-03-07 17:16:01 +0000
@@ -35,6 +35,7 @@
 from aptdaemon import enums, errors
 
 REPO_PATH = os.path.join(aptdaemon.test.get_tests_dir(), "repo")
+DEBS_PATH = os.path.join(aptdaemon.test.get_tests_dir(), "debs")
 
 
 class MockQueue(object):
@@ -256,6 +257,17 @@
         self.worker._cache.open()
         self.assertTrue(self.worker._cache["silly-depend-base"].is_installed)
 
+    def test_install_file_not_known_to_cache(self):
+        """ this tests that a local deb file (that is not known to the cache)
+            can be installed
+        """
+        pkg = os.path.join(DEBS_PATH, "utf8-package_1.0-1_all.deb")
+        trans = Transaction(enums.ROLE_INSTALL_FILE, self.queue, os.getuid(),
+                            "org.debian.apt.test", bus=self.dbus,
+                            kwargs={"path": os.path.join(REPO_PATH, pkg),
+                                    "force": True})
+        self.worker.simulate(trans)
+
     def test_fix_broken_depends(self):
         """Test the fixing of broken dependencies."""
         for pkg in ["silly-base_0.1-0_all.deb", "silly-broken_0.1-0_all.deb"]: