* cherry pick debfile fix from lp:~mvo/python-apt/mvo (402..405):

  * apt/debfile.py:
    - fix error when reading binary content and add regresion test

3 files changed, 13 insertions, 0 deletions

diff --git a/tests/data/test_debs/gdebi-test11.deb b/tests/data/test_debs/gdebi-test11.deb
new file mode 100644
index 00000000..af9b441f
--- /dev/null
+++ b/tests/data/test_debs/gdebi-test11.deb
diff --git a/tests/data/test_debs/gdebi-test12.deb b/tests/data/test_debs/gdebi-test12.deb
new file mode 100644
index 00000000..36544cc7
--- /dev/null
+++ b/tests/data/test_debs/gdebi-test12.deb
diff --git a/tests/test_debfile.py b/tests/test_debfile.py
index 5874dfc4..42cda6f6 100644
--- a/tests/test_debfile.py
+++ b/tests/test_debfile.py
@@ -77,6 +77,19 @@ class TestDebfilee(unittest.TestCase):
                 "Unexpected result for package '%s' (got %s wanted %s)\n%s" % (
                     filename, res, expected_res, deb._failure_string))
 
+    def testContent(self):
+        # normal
+        deb = apt.debfile.DebPackage(cache=self.cache)
+        deb.open(os.path.join("data", "test_debs", "gdebi-test11.deb"))
+        self.assertEqual('#!/bin/sh\necho "test"\n',
+                         deb.data_content("usr/bin/test"))
+        # binary
+        deb = apt.debfile.DebPackage(cache=self.cache)
+        deb.open(os.path.join("data", "test_debs", "gdebi-test12.deb"))
+        content = deb.data_content("usr/bin/binary")
+        self.assertTrue(content.startswith("Automatically converted to printable ascii:\n\x7fELF "))
+                  
+
 if __name__ == "__main__":
     #logging.basicConfig(level=logging.DEBUG)
     unittest.main()