Commit 0e4107e Hidenori Matsubayashi
authored
1 parent fad1d30 commit 0e4107e Copy full SHA for 0e4107e
File tree 6 files changed +7
-8
lines changed
6 files changed +7
-8
lines changed Original file line number Diff line number Diff line change 1
- d3ea636dc5d16b56819f3266241e1f708979c233
1
+ 40a99c595137e4b2f5b2efa8ff343ea23c1e16b8
Original file line number Diff line number Diff line change 1
- 18116933e77adc82f80866c928266a5b4f1ed645
1
+ cf4400006550b70f28e4b4af815151d1e74846c6
Original file line number Diff line number Diff line change @@ -279,12 +279,12 @@ class ELinuxUpgradeCommandRunner {
279
279
/// Source: [runCommandSecondHalf] in `upgrade.dart`
280
280
Future <void > runCommandSecondHalf () async {
281
281
// Make sure the welcome message re-display is delayed until the end.
282
- globals.persistentToolState.redisplayWelcomeMessage = false ;
282
+ globals.persistentToolState.setShouldRedisplayWelcomeMessage ( false ) ;
283
283
await precacheArtifacts ();
284
284
await updatePackages ();
285
285
await runDoctor ();
286
286
// Force the welcome message to re-display following the upgrade.
287
- globals.persistentToolState.redisplayWelcomeMessage = true ;
287
+ globals.persistentToolState.setShouldRedisplayWelcomeMessage ( true ) ;
288
288
}
289
289
290
290
/// Source: [precacheArtifacts] in `upgrade.dart`
Original file line number Diff line number Diff line change @@ -164,8 +164,8 @@ class ELinuxDevice extends Device {
164
164
final ProtocolDiscovery discovery = ProtocolDiscovery .observatory (
165
165
_logReader,
166
166
portForwarder: _config.usesPortForwarding ? portForwarder : null ,
167
- hostPort: null ,
168
- devicePort: null ,
167
+ hostPort: debuggingOptions ? .hostVmServicePort ,
168
+ devicePort: debuggingOptions ? .deviceVmServicePort ,
169
169
logger: _logger,
170
170
ipv6: ipv6,
171
171
);
Original file line number Diff line number Diff line change @@ -77,7 +77,7 @@ class ELinuxRemoteDevicesConfig {
77
77
for (final MapEntry <int , dynamic > entry in typedList.asMap ().entries) {
78
78
try {
79
79
revived.add (ELinuxRemoteDeviceConfig .fromJson (entry.value));
80
- } on ELinuxRemoteDeviceRevivalException catch (e ) {
80
+ } on ELinuxRemoteDeviceRevivalException catch (_ ) {
81
81
// TODO(hidenori): Corrensponds to the format difference
82
82
// from the default schema and uncooment here.
83
83
//
Original file line number Diff line number Diff line change @@ -141,7 +141,6 @@ Future<void> main(List<String> args) async {
141
141
stdio: globals.stdio,
142
142
terminal: globals.terminal,
143
143
outputPreferences: globals.outputPreferences,
144
- stopwatchFactory: const StopwatchFactory (),
145
144
)),
146
145
},
147
146
);
You can’t perform that action at this time.
0 commit comments