Merge lp:~jml/pkgme-devportal/remove-ldd into lp:pkgme-devportal

[Jonathan Lange]

Remove the obsolete ldd code and tests.

Bug 901439 points out that the ldd tests fail on lucid. Since ldd is no longer actually used by pkgme-binary, this branch just deletes the code and the tests.

In addition, it removes the strategy pattern from get_shared_library_dependencies. Instead of taking a function that calculates libraries, it's now hard-coded to use objdump.

[James Westby (james-w)]

review: Approve

=== modified file 'devportalbinary/binary.py'
--- devportalbinary/binary.py	2011-11-23 12:25:33 +0000
+++ devportalbinary/binary.py	2011-12-08 13:02:26 +0000
@@ -190,66 +190,11 @@
     return libraries
 
 
-def ldd(binary_paths):
-    # ldd has output of the form:
-    #
-    # path/to/elf/object:
-    #    linux-vdso.so.1 =>  (0x00007fff4a7ff000)
-    #    libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f7472623000)
-    #    /lib64/ld-linux-x86-64.so.2 (0x00007f74729e5000)
-    #
-    # i.e.
-    #    <name> => (not found|<path> (<address>))
-    #
-    # where <name> and <path> are both optional. If <name> is not given, then
-    # there is no arrow (=>).
-    binary_paths = list(binary_paths)
-    if not binary_paths:
-        return {}
-    cmd = ['ldd'] + binary_paths
-    output = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
-    libraries = {}
-    current = []
-    if len(binary_paths) == 1:
-        libraries[binary_paths[0]] = current
-    for line in output.splitlines():
-        if line.endswith(':'):
-            current.sort()
-            current = libraries[line.strip(':')] = []
-            continue
-        tokens = line.split()
-        name, path = None, None
-        if '=>' in tokens:
-            name = tokens[0]
-            if (len(tokens) > 2
-                and tokens[2:] != ['not', 'found']
-                and not (tokens[2].startswith('(')
-                         and tokens[2].endswith(')'))):
-                path = tokens[2]
-        else:
-            path = tokens[0]
-        current.append((name, path))
-    current.sort()
-    return libraries
-
-
-def needed_libraries_from_ldd(binary_paths):
-    # We don't consider virtual DSOs generated by the kernel, or libraries
-    # without actual names to be dependencies.
-    BLACKLIST = ['linux-vdso.so.1', 'linux-gate.so.1', None]
-    libs = ldd(binary_paths)
-    new_libs = {}
-    for path in libs:
-        new_libs[path] = [
-            name for name, path in libs[path] if name not in BLACKLIST]
-    return new_libs
-
-
-def get_shared_library_dependencies(paths, library_finder=needed_libraries_from_objdump):
+def get_shared_library_dependencies(paths):
     """Find all of the shared libraries depended on the ELF binaries in 'paths'.
     """
     so_names = set()
-    libraries = library_finder(paths)
+    libraries = needed_libraries_from_objdump(paths)
     for libs in libraries.values():
         for name in libs:
             so_names.add(name)

=== modified file 'devportalbinary/tests/test_binary.py'
--- devportalbinary/tests/test_binary.py	2011-11-23 12:25:33 +0000
+++ devportalbinary/tests/test_binary.py	2011-12-08 13:02:26 +0000
@@ -22,7 +22,6 @@
     guess_executable,
     iter_binaries,
     iter_executables,
-    ldd,
     METADATA_FILE,
     needed_libraries_from_objdump,
     NoBinariesFound,
@@ -295,43 +294,6 @@
 
 class GetSharedLibraryDependenciesTests(TestCase):
 
-    def test_ldd_none(self):
-        deps = ldd([])
-        self.assertEqual({}, deps)
-
-    def test_ldd(self):
-        hello = os.path.join(os.path.dirname(__file__), 'hello')
-        deps = ldd([hello])
-        self.assertEqual(
-            {hello: [(None, '/lib64/ld-linux-x86-64.so.2'),
-                     ('libc.so.6', '/lib/x86_64-linux-gnu/libc.so.6'),
-                     ('linux-vdso.so.1', None)]},
-            deps)
-
-    def test_ldd_not_found(self):
-        hello = os.path.join(os.path.dirname(__file__), 'hello-missing-deps')
-        deps = ldd([hello])
-        self.assertEqual(
-            {hello: [(None, '/lib64/ld-linux-x86-64.so.2'),
-                     ('libc.so.6', '/lib/x86_64-linux-gnu/libc.so.6'),
-                     ('libnowaythisexists.so.1', None),
-                     ('linux-vdso.so.1', None),
-                     ]},
-            deps)
-
-    def test_ldd_multiple(self):
-        hello = os.path.join(os.path.dirname(__file__), 'hello')
-        simple = os.path.join(os.path.dirname(__file__), 'simple.so.1')
-        deps = ldd([hello, simple])
-        self.assertEqual(
-            {hello: [(None, '/lib64/ld-linux-x86-64.so.2'),
-                     ('libc.so.6', '/lib/x86_64-linux-gnu/libc.so.6'),
-                     ('linux-vdso.so.1', None)],
-             simple: [(None, '/lib64/ld-linux-x86-64.so.2'),
-                     ('libc.so.6', '/lib/x86_64-linux-gnu/libc.so.6'),
-                     ('linux-vdso.so.1', None)]},
-            deps)
-
     def test_get_shared_library_dependencies(self):
         hello = os.path.join(os.path.dirname(__file__), 'hello')
         deps = get_shared_library_dependencies([hello])