Merge lp:~james-w/pkgme-devportal/strip-epochs into lp:pkgme-devportal

[James Westby]

Strip epochs from version numbers when calculating the .deb url on LP.

Hi,

We have a large number of libraries not in the dependency db because
we can't currently fetch the .deb from LP. That's becuase they have epochs
in the version numbers, but they aren't in the filename. This changes
the url calculation to strip epochs.

This is rather hacky in a number of ways:

  * The epoch stripping. This could be done with code from python-debian
    if we want the extra dependency.

  * The tests. This could be done with mock, or could be done with better
    fakes for the launchpadlib stuff.

As ever, happy to make any changes that you feel are warranted.

Thanks,

James

[Jonathan Lange (jml)]

Looks good. Thanks.

I guess it would be nice if Python had a thing that took nested dicts and turned them into nested objects.

review: Approve

[James Westby (james-w)]

That would indeed be nice.

Thanks,

James

=== modified file 'devportalbinary/database.py'
--- devportalbinary/database.py	2012-08-29 14:39:18 +0000
+++ devportalbinary/database.py	2012-08-29 16:11:29 +0000
@@ -128,10 +128,13 @@
 
     def get_url(self):
         """Get the download URL for this binary package."""
+        version = self.bpph.binary_package_version
+        if ':' in version:
+            version = version[version.index(':')+1:]
         return '%s/+files/%s_%s_%s.deb' % (
             self.bpph.archive.web_link,
             self.bpph.binary_package_name,
-            self.bpph.binary_package_version,
+            version,
             self.bpph.distro_arch_series.architecture_tag,
             )
 

=== modified file 'devportalbinary/tests/test_database.py'
--- devportalbinary/tests/test_database.py	2012-08-29 14:39:18 +0000
+++ devportalbinary/tests/test_database.py	2012-08-29 16:11:29 +0000
@@ -1,3 +1,4 @@
+from collections import namedtuple
 import gzip
 import os
 
@@ -15,6 +16,7 @@
 
 from devportalbinary.database import (
     AptFilePackageDatabase,
+    BinaryPackage,
     build_symbol_list,
     load_configuration,
     PackageDatabase,
@@ -203,3 +205,39 @@
             db.get_dependencies("libfoo.so.2", arch="i386"),
             set(["pkgfoo", "pkgbar"]))
         self.assertEqual(len(db._get_lib_to_pkgs_mapping("oneiric", "i386")), 1)
+
+
+class FakeBPPH(object):
+
+    def __init__(self):
+        self.archive = namedtuple(
+                'Archive', 'web_link')('http://lp.net/archive')
+        self.distro_arch_series = namedtuple(
+                'DistroArchSeries', 'architecture_tag')('i386')
+        self.binary_package_name = 'foo'
+        self.binary_package_version = '1'
+
+
+class TestBinaryPackage(TestCase):
+
+    def test_get_url(self):
+        bpph = FakeBPPH()
+        expected_url = '%s/+files/%s_%s_%s.deb' % (
+            bpph.archive.web_link,
+            bpph.binary_package_name,
+            bpph.binary_package_version,
+            bpph.distro_arch_series.architecture_tag,
+            )
+        self.assertEqual(expected_url, BinaryPackage(bpph).get_url())
+
+    def test_get_url_with_epoch(self):
+        # epochs are stripped from the version number
+        bpph = FakeBPPH()
+        bpph.binary_package_version = '1:1'
+        expected_url = '%s/+files/%s_%s_%s.deb' % (
+            bpph.archive.web_link,
+            bpph.binary_package_name,
+            '1',
+            bpph.distro_arch_series.architecture_tag,
+            )
+        self.assertEqual(expected_url, BinaryPackage(bpph).get_url())