Skip to content

Commit 9d40bc5

Browse files
committed
Entirely remove --no-capture-output.
It still makes some case fail. I hope we don't pay the price by having python logs that are not sent to TrackMate...
1 parent dc33b69 commit 9d40bc5

1 file changed

Lines changed: 3 additions & 14 deletions

File tree

src/main/java/fiji/plugin/trackmate/util/cli/CondaCLIConfigurator.java

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* it under the terms of the GNU General Public License as
99
* published by the Free Software Foundation, either version 3 of the
1010
* License, or (at your option) any later version.
11-
*
11+
*
1212
* This program is distributed in the hope that it will be useful,
1313
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1515
* GNU General Public License for more details.
16-
*
16+
*
1717
* You should have received a copy of the GNU General Public
1818
* License along with this program. If not, see
1919
* <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -141,13 +141,7 @@ protected CondaCLIConfigurator()
141141
// The executable stuff.
142142
final String envname = ( String ) s;
143143
cmd.add( envname );
144-
// Only add '--no-capture-output' if:
145-
// 1. we are NOT using micromamba, and
146-
// 2. we are NOT on Windows (since it breaks .bat)
147-
if ( !isMicromamba( condaPath ) && !os.contains( "win" ) )
148-
{
149-
cmd.add( "--no-capture-output" );
150-
}
144+
151145
// The rest of the command, split by spaces.
152146
final String executableCommand = getCommand();
153147
final String[] split = executableCommand.split( " " );
@@ -156,11 +150,6 @@ protected CondaCLIConfigurator()
156150
} );
157151
}
158152

159-
private static boolean isMicromamba( final String path )
160-
{
161-
return path != null && path.toLowerCase().contains( "micromamba" );
162-
}
163-
164153
@Override
165154
public CondaEnvironmentCommand getCommandArg()
166155
{

0 commit comments

Comments
 (0)