Merge lp:~jml/pkgme-devportal/better-error-when-no-objects into lp:pkgme-devportal

[Jonathan Lange]

Hello,

This branch fixes bug 890520. It also correctly specifies all of the dependencies for pkgme-binary, since I had to develop this in a no-site-packages virtualenv in order to avoid bugs like bug 893970 and bug 893520.

There's not much to see here. I added a new exception type, made sure that it inherited from PkgmeError to avoid nasty stack traces and raise it when there are no binaries found.

Thanks,
jml

[James Westby (james-w)]

review: Approve

=== modified file 'devportalbinary/binary.py'
--- devportalbinary/binary.py	2011-11-16 15:59:44 +0000
+++ devportalbinary/binary.py	2011-11-23 12:30:29 +0000
@@ -38,11 +38,10 @@
    ]
 
 
-import bsddb
-import gzip
 import os
 import subprocess
 
+from pkgme.errors import PkgmeError
 from pkgme.info_elements import (
     ApplicationName,
     Categories,
@@ -77,6 +76,12 @@
 
 # XXX: No idea about how icons will be there. Ignoring for now.
 
+
+class NoBinariesFound(PkgmeError):
+    """Raised when we cannot find any binaries to examine for dependencies.
+    """
+
+
 def guess_executable(package_name, executables):
     """
     From a list of executables, guess which one is likely to be the main
@@ -165,7 +170,9 @@
 
 def needed_libraries_from_objdump(binary_paths):
     binary_paths = list(binary_paths)
-    cmd = [OBJDUMP, '-f', '-p'] + list(binary_paths)
+    if not binary_paths:
+        raise NoBinariesFound()
+    cmd = [OBJDUMP, '-f', '-p'] + binary_paths
     output = run_subprocess(cmd)
     libraries = {}
     last_line_was_blank = True

=== modified file 'devportalbinary/tests/test_binary.py'
--- devportalbinary/tests/test_binary.py	2011-10-24 21:48:58 +0000
+++ devportalbinary/tests/test_binary.py	2011-11-23 12:30:29 +0000
@@ -24,6 +24,8 @@
     iter_executables,
     ldd,
     METADATA_FILE,
+    needed_libraries_from_objdump,
+    NoBinariesFound,
     )
 from devportalbinary.testing import DatabaseFixture
 
@@ -34,6 +36,12 @@
         self.assertEqual('devportal-metadata.json', METADATA_FILE)
 
 
+class TestObjDump(TestCase):
+
+    def test_no_binaries(self):
+        self.assertRaises(NoBinariesFound, needed_libraries_from_objdump, [])
+
+
 class InstallFileTests(TestCase):
 
     def test_install_file(self):

=== modified file 'setup.py'
--- setup.py	2011-11-16 16:46:06 +0000
+++ setup.py	2011-11-23 12:30:29 +0000
@@ -27,6 +27,7 @@
     test_suite='devportalbinary.tests',
     install_requires = [
         'bzr',
+        'launchpadlib',
         'pkgme',
         ],
     entry_points = {