Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at fix-function-merge 37 lines 2.3 kB view raw
1diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart 2index b7e624b4e2..edfdde118b 100644 3--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart 4+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart 5@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and 6 7 // Populate the cache. We call this before pub get below so that the 8 // sky_engine package is available in the flutter cache for pub to find. 9- if (shouldUpdateCache) { 10+ if (false) { 11 // First always update universal artifacts, as some of these (e.g. 12 // ios-deploy on macOS) are required to determine `requiredArtifacts`. 13 final bool offline; 14diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart 15index 5d6d78639f..90a4dfa555 100644 16--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart 17+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart 18@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { 19 globals.flutterUsage.suppressAnalytics = true; 20 } 21 22- globals.flutterVersion.ensureVersionFile(); 23 final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; 24 final bool ci = await globals.botDetector.isRunningOnBot; 25 final bool redirectedCompletion = !globals.stdio.hasTerminal && 26@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { 27 final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; 28 final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; 29 30- if (topLevelResults.command?.name != 'upgrade' && 31- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { 32- await globals.flutterVersion.checkFlutterVersionFreshness(); 33- } 34- 35 // See if the user specified a specific device. 36 final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; 37 if (specifiedDeviceId != null) {