Use correct envvar for picking bitfilter.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2019-01-17 12:42:41 -08:00
parent a409bb8539
commit 4ccb89307a
4 changed files with 8 additions and 4 deletions

View File

@ -61,5 +61,5 @@ for tile, pips_srcs_dsts in tiledata.items():
elif src_dst[1] not in dsts:
segmk.add_tile_tag(tile, "%s.%s" % (dst, src), 0)
segmk.compile(bitfilter=get_bitfilter(os.getenv('XRAY_PART'), 'INT'))
segmk.compile(bitfilter=get_bitfilter(os.getenv('XRAY_DATABASE'), 'INT'))
segmk.write()

View File

@ -55,5 +55,5 @@ for tile, pips_srcs_dsts in tiledata.items():
elif src_dst[1] not in dsts:
segmk.add_tile_tag(tile, "%s.%s" % (dst, src), 0)
segmk.compile(bitfilter=get_bitfilter(os.getenv('XRAY_PART'), 'INT'))
segmk.compile(bitfilter=get_bitfilter(os.getenv('XRAY_DATABASE'), 'INT'))
segmk.write()

View File

@ -86,5 +86,5 @@ for tile, pips_srcs_dsts in tiledata.items():
elif src_dst[1] not in dsts:
segmk.add_tile_tag(tile, "%s.%s" % (dst, src), 0)
segmk.compile(bitfilter=get_bitfilter(os.getenv('XRAY_PART'), 'INT'))
segmk.compile(bitfilter=get_bitfilter(os.getenv('XRAY_DATABASE'), 'INT'))
segmk.write()

View File

@ -39,4 +39,8 @@ def get_bitfilter(part, tile):
Either returns bitfilter to specified part and tile type, or the default
bitfilter, which includes all bits.
"""
return BITFILTERS.get((part, tile), None)
key = (part, tile)
if key in BITFILTERS:
return BITFILTERS[key].filter
else:
return None