firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a small conductor messaging bug (#90229)

Browse Source 
* fixed a small messaging bug

* forgot to remove a s
This commit is contained in:
Alex 2021-09-16 18:37:47 -04:00 committed by GitHub
parent 93de90bc26
commit 0bde65ddac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dev/conductor/lib/next.dart
View File

@ -137,7 +137,11 @@ void runNext({
if (unappliedCherrypicks.isEmpty) { if (unappliedCherrypicks.isEmpty) {
stdio.printStatus('All engine cherrypicks have been auto-applied by the conductor.\n'); stdio.printStatus('All engine cherrypicks have been auto-applied by the conductor.\n');
} else { } else {
stdio.printStatus('There were ${unappliedCherrypicks.length} cherrypicks that were not auto-applied.'); if (unappliedCherrypicks.length == 1) {
stdio.printStatus('There was ${unappliedCherrypicks.length} cherrypick that was not auto-applied.');
} else {
stdio.printStatus('There were ${unappliedCherrypicks.length} cherrypicks that were not auto-applied.');
}
stdio.printStatus('These must be applied manually in the directory ' stdio.printStatus('These must be applied manually in the directory '
'${state.engine.checkoutPath} before proceeding.\n'); '${state.engine.checkoutPath} before proceeding.\n');
} }
@ -264,9 +268,12 @@ void runNext({
} else if (unappliedCherrypicks.isEmpty) { } else if (unappliedCherrypicks.isEmpty) {
stdio.printStatus('All framework cherrypicks were auto-applied by the conductor.'); stdio.printStatus('All framework cherrypicks were auto-applied by the conductor.');
} else { } else {
stdio.printStatus( if (unappliedCherrypicks.length == 1) {
'There were ${unappliedCherrypicks.length} cherrypicks that were not auto-applied.', stdio.printStatus('There was ${unappliedCherrypicks.length} cherrypick that was not auto-applied.',);
); }
else {
stdio.printStatus('There were ${unappliedCherrypicks.length} cherrypicks that were not auto-applied.',);
}
stdio.printStatus( stdio.printStatus(
'These must be applied manually in the directory ' 'These must be applied manually in the directory '
'${state.framework.checkoutPath} before proceeding.\n', '${state.framework.checkoutPath} before proceeding.\n',

2
dev/conductor/test/next_test.dart
View File

@ -751,7 +751,7 @@ void main() {
); );
expect( expect(
stdio.stdout, stdio.stdout,
contains('There were 1 cherrypicks that were not auto-applied'), contains('There was 1 cherrypick that was not auto-applied'),
); );
expect( expect(
stdio.stdout, stdio.stdout,