Merge lp:~mvo/pkgme-devportal/raise-on-unsupported-architectures into lp:pkgme-devportal

[Michael Vogt]

Raise an error if a binary is for a non-supported architecture.

This simply fails early it it detect architecture is not what we support. Not sure if that is the right place or if it should instead go into a different function. It also makes mixed native i386/native amd64 tarballs fail currently which is not what we want. But those mixed tarballs fail currently anyway so there is no regression.

[Jonathan Lange (jml)]

I'm OK with this.

review: Approve

[ISD Branch Mangler (isd-branches-mangler)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'acceptance/data/bundled_lib/Makefile'
--- acceptance/data/bundled_lib/Makefile	2012-07-16 18:13:36 +0000
+++ acceptance/data/bundled_lib/Makefile	2012-07-24 16:22:19 +0000
@@ -2,10 +2,10 @@
 all: libtest.so uselib
 
 uselib: libtest.so
-	gcc -o $@ $@.c -L. -ltest
+	gcc -o $@ $@.c -m32 -L. -ltest
 
 libtest.so: libtest.c
-	gcc -shared -fPIC -o $@ $<
+	gcc -shared -m32 -fPIC -o $@ $<
 
 clean:
-	rm *~ *.o *.so uselib
 \ No newline at end of file
+	rm *~ *.o *.so uselib
 
=== modified file 'acceptance/data/bundled_lib/libtest.so'
 Binary files acceptance/data/bundled_lib/libtest.so	2012-07-18 10:08:31 +0000 and acceptance/data/bundled_lib/libtest.so	2012-07-24 16:22:19 +0000 differ
=== modified file 'acceptance/data/bundled_lib/uselib'
 Binary files acceptance/data/bundled_lib/uselib	2012-07-18 10:05:58 +0000 and acceptance/data/bundled_lib/uselib	2012-07-24 16:22:19 +0000 differ
=== modified file 'acceptance/data/gtk/Makefile'
--- acceptance/data/gtk/Makefile	2011-11-15 17:27:30 +0000
+++ acceptance/data/gtk/Makefile	2012-07-24 16:22:19 +0000
@@ -1,3 +1,3 @@
-CFLAGS=`pkg-config --cflags gtk+-2.0`
+CFLAGS=`pkg-config --cflags gtk+-2.0` -m32
 
 all: test_gtk
 
=== modified file 'acceptance/data/gtk/test_gtk'
 Binary files acceptance/data/gtk/test_gtk	2011-11-15 17:27:30 +0000 and acceptance/data/gtk/test_gtk	2012-07-24 16:22:19 +0000 differ
=== modified file 'devportalbinary/binary.py'
--- devportalbinary/binary.py	2012-07-24 15:05:27 +0000
+++ devportalbinary/binary.py	2012-07-24 16:22:19 +0000
@@ -71,6 +71,10 @@
     """Raised when we do not know which dependency to add."""
 
 
+class UnsupportedArchitecture(PkgmeError):
+    """Raised when we find a unsupported architecture."""
+
+
 def guess_executable(package_name, executables):
     """
     From a list of executables, guess which one is likely to be the main
@@ -130,6 +134,7 @@
     binary_paths = list(binary_paths)
     if not binary_paths:
         raise NoBinariesFound()
+    conf = load_configuration()
     cmd = [OBJDUMP, '-f', '-p'] + binary_paths
     output = run_subprocess(cmd)
     libraries = {}
@@ -144,6 +149,13 @@
             libraries[current_binary] = []
         if line.startswith('  NEEDED'):
             libraries[current_binary].append(line.split()[1])
+        elif line.startswith('architecture: '):
+            # so... i386 is reported as "i386" 
+            # *but* amd64 as "i386:x86-64" 
+            architecture = line.partition(":")[2].partition(",")[0].strip()
+            if architecture not in conf.options.architectures_supported:
+                raise UnsupportedArchitecture(
+                    "Can not handle '%s'" % architecture)
         last_line_was_blank = this_line_blank
     return libraries
 
 
=== modified file 'devportalbinary/tests/data/bundled_library/libtest.so'
 Binary files devportalbinary/tests/data/bundled_library/libtest.so	2012-07-17 08:48:57 +0000 and devportalbinary/tests/data/bundled_library/libtest.so	2012-07-24 16:22:19 +0000 differ
=== modified file 'devportalbinary/tests/data/bundled_library/uselib'
 Binary files devportalbinary/tests/data/bundled_library/uselib	2012-07-17 08:48:57 +0000 and devportalbinary/tests/data/bundled_library/uselib	2012-07-24 16:22:19 +0000 differ
=== modified file 'devportalbinary/tests/data/hello/hello'
 Binary files devportalbinary/tests/data/hello/hello	2011-12-22 22:41:37 +0000 and devportalbinary/tests/data/hello/hello	2012-07-24 16:22:19 +0000 differ