From c1e3b75cc22a4f72ad3a556ca3abc0fcf24bcedb Mon Sep 17 00:00:00 2001 From: xster Date: Fri, 30 Jun 2017 11:17:48 -0700 Subject: [PATCH] Verbose cocoapods output if error or flutter is verbose (#11048) * Output verbose cocoapods output when pod install has an error or if flutter build/run is in -v * remove repeated stdout --- packages/flutter_tools/lib/src/ios/mac.dart | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart index 7ffa2273ee7..e9f845faaa2 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart @@ -437,14 +437,23 @@ Future _runPodInstall(Directory bundle, String engineDirectory) async { } final Status status = logger.startProgress('Running pod install...', expectSlowOperation: true); final ProcessResult result = await processManager.run( - ['pod', 'install'], - workingDirectory: bundle.path, - environment: {'FLUTTER_FRAMEWORK_DIR': engineDirectory}, + ['pod', 'install', '--verbose'], + workingDirectory: bundle.path, + environment: {'FLUTTER_FRAMEWORK_DIR': engineDirectory}, ); status.stop(); - if (result.exitCode != 0) { - throwToolExit('Error running pod install:\n${result.stdout}'); + if (logger.isVerbose || result.exitCode != 0) { + if (result.stdout.isNotEmpty) { + printStatus('CocoaPods\' output:\n↳'); + printStatus(result.stdout, indent: 4); + } + if (result.stderr.isNotEmpty) { + printStatus('Error output from CocoaPods:\n↳'); + printStatus(result.stderr, indent: 4); + } } + if (result.exitCode != 0) + throwToolExit('Error running pod install'); } }