Skip to content

Commit 4f88c53

Browse files
committed
REF combine out+err so that order is right
1 parent 421d97b commit 4f88c53

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

conda_forge_tick/provide_source_code.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,18 @@ def provide_source_code_local(recipe_dir):
101101
The path to the source code directory.
102102
"""
103103
out = None
104-
err = None
105104

106-
def _print_out_err():
105+
def _print_out():
107106
try:
108107
if out:
109108
sys.stdout.write(out.read())
110-
if err:
111-
sys.stderr.write(err.read())
112109
except Exception as e:
113110
logger.error(
114111
"Error printing out/err in getting conda build src!", exc_info=e
115112
)
116113

117114
try:
118-
with wurlitzer.pipes() as (out, err):
115+
with wurlitzer.pipes(stderr=wurlitzer.STDOU) as (out):
119116
from conda_build.api import render
120117
from conda_build.config import Config
121118
from conda_build.source import provide
@@ -134,7 +131,7 @@ def _print_out_err():
134131
# provide source dir
135132
yield provide(md)
136133
except (SystemExit, Exception) as e:
137-
_print_out_err()
134+
_print_out()
138135
raise RuntimeError("conda build src exception: " + str(e))
139136

140-
_print_out_err()
137+
_print_out()

0 commit comments

Comments
 (0)