summaryrefslogtreecommitdiff
path: root/baserockimport/lorryset.py
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2015-01-14 16:06:53 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2015-01-14 16:06:53 +0000
commit8f32749511f4cab0ac1c6d74025fc1b21578996c (patch)
treef6cc78d83f1a7b5c330b8a54732c2ee84191f34a /baserockimport/lorryset.py
parentb092a66c21cb977a872d2b45d8edec31d96eeb28 (diff)
parent8d0448d044f20a148f98700a691a83c95308a8e8 (diff)
downloadimport-8f32749511f4cab0ac1c6d74025fc1b21578996c.tar.gz
Merge branch 'baserock/richardipsum/fix-lorry-bug-3'
Reviewed by: Sam Thursfield <sam.thursfield@codethink.co.uk>
Diffstat (limited to 'baserockimport/lorryset.py')
-rw-r--r--baserockimport/lorryset.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/baserockimport/lorryset.py b/baserockimport/lorryset.py
index 8cc73af..f252b9f 100644
--- a/baserockimport/lorryset.py
+++ b/baserockimport/lorryset.py
@@ -107,7 +107,7 @@ class LorrySet(object):
'''Return the lorry entry for the named project.'''
return {name: self.data[name]}
- def find_lorry_for_package(self, kind, package_name):
+ def find_lorry_for_package(self, kind, package_name, comp):
'''Find the lorry entry for a given foreign package, or return None.
This makes use of an extension to the .lorry format made by the
@@ -116,11 +116,12 @@ class LorrySet(object):
named $KIND.
'''
+
key = 'x-products-%s' % kind
for name, lorry in self.data.iteritems():
products = lorry.get(key, [])
for entry in products:
- if entry == package_name:
+ if comp(entry, package_name):
return {name: lorry}
return None