Skip to content

Commit

Permalink
work around new conda-build output name bug
Browse files Browse the repository at this point in the history
sbourdeauducq committed Mar 6, 2017
1 parent 938f965 commit a89ef53
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion master.cfg
Original file line number Diff line number Diff line change
@@ -196,8 +196,10 @@ def addCondaBuildSteps(factory, project, package, is_xilinx=False):
locks = default_locks +
[conda_lock.access('exclusive')]))

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

0 comments on commit a89ef53

Please sign in to comment.