Skip to content

Commit a89ef53

Browse files
committedMar 6, 2017
work around new conda-build output name bug
1 parent 938f965 commit a89ef53

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed
 

‎master.cfg

+3-1
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,10 @@ def addCondaBuildSteps(factory, project, package, is_xilinx=False):
196196
locks = default_locks +
197197
[conda_lock.access('exclusive')]))
198198

199+
# HACK: conda-build 2.1.5 (but not 1.19.2) says it puts noarch packages
200+
# in conda-bld/noarch, but puts them into conda-bld/linux-64 instead.
199201
def extract_output_name(rc, stdout, stderr):
200-
return { 'output_name': stdout.strip() }
202+
return { 'output_name': stdout.strip().replace('noarch', 'linux-64') }
201203
factory.addStep(
202204
SetPropertyFromCommand(
203205
name = 'get_output_name',

0 commit comments

Comments
 (0)