Skip to content

Commit ac39e65

Browse files
authored
Merge pull request #55 from lubomir/module-version
Get module builds based on name and stream only
2 parents f5502e5 + f6d5753 commit ac39e65

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

product_listings_manager/products.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,14 +260,13 @@ def compose_get_dbh():
260260
return pgdb.connect(database=dbname, host=dbhost, user=dbuser, password=dbpasswd)
261261
compose_get_dbh = staticmethod(compose_get_dbh)
262262

263-
def get_module(compose_dbh, name, stream, version):
264-
qargs = dict(name=name, stream=stream, version=version)
263+
def get_module(compose_dbh, name, stream):
264+
qargs = dict(name=name, stream=stream)
265265
qry = """
266266
SELECT id
267267
FROM modules
268268
WHERE name = %(name)s
269269
AND stream = %(stream)s
270-
AND version = %(version)s
271270
"""
272271
dbc = compose_dbh.cursor()
273272
Products.execute_query(dbc, qry, **qargs)
@@ -452,14 +451,13 @@ def getModuleProductListings(productLabel, moduleNVR):
452451
module = build['extra']['typeinfo']['module']
453452
module_name = module['name']
454453
module_stream = module['stream']
455-
module_version = module['version']
456454
except (KeyError, TypeError):
457455
raise ProductListingsNotFoundError("It's not a module build: %s" % moduleNVR)
458456

459457
prodinfo = Products.get_product_info(compose_dbh, productLabel)
460458
version, variants = prodinfo
461459

462-
module = Products.get_module(compose_dbh, module_name, module_stream, module_version)
460+
module = Products.get_module(compose_dbh, module_name, module_stream)
463461
if not module:
464462
raise ProductListingsNotFoundError("Could not find a module build with NVR: %s" % moduleNVR)
465463
module_id = module[0]

0 commit comments

Comments
 (0)