Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
0d4f4bdd
Unverified
Commit
0d4f4bdd
authored
Jun 19, 2019
by
Jonah Williams
Committed by
GitHub
Jun 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't crash on invalid .packages file in initial run(#34527)
parent
49449505
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
1 deletion
+23
-1
flutter_command_runner.dart
.../flutter_tools/lib/src/runner/flutter_command_runner.dart
+10
-1
flutter_command_runner_test.dart
...lutter_tools/test/runner/flutter_command_runner_test.dart
+13
-0
No files found.
packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
View file @
0d4f4bdd
...
...
@@ -545,7 +545,16 @@ class FlutterCommandRunner extends CommandRunner<void> {
// Check that the flutter running is that same as the one referenced in the pubspec.
if
(
fs
.
isFileSync
(
kPackagesFileName
))
{
final
PackageMap
packageMap
=
PackageMap
(
kPackagesFileName
);
final
Uri
flutterUri
=
packageMap
.
map
[
'flutter'
];
Uri
flutterUri
;
try
{
flutterUri
=
packageMap
.
map
[
'flutter'
];
}
on
FormatException
{
// We're not quite sure why this can happen, perhaps the user
// accidentally edited the .packages file. Re-running pub should
// fix the issue, and we definitely shouldn't crash here.
printTrace
(
'Failed to parse .packages file to check flutter dependency.'
);
return
;
}
if
(
flutterUri
!=
null
&&
(
flutterUri
.
scheme
==
'file'
||
flutterUri
.
scheme
==
''
))
{
// .../flutter/packages/flutter/lib
...
...
packages/flutter_tools/test/runner/flutter_command_runner_test.dart
View file @
0d4f4bdd
...
...
@@ -103,6 +103,19 @@ void main() {
},
initializeFlutterRoot:
false
);
});
testUsingContext
(
'Doesnt crash on invalid .packages file'
,
()
async
{
fs
.
file
(
'pubspec.yaml'
).
createSync
();
fs
.
file
(
'.packages'
)
..
createSync
()
..
writeAsStringSync
(
'Not a valid package'
);
await
runner
.
run
(<
String
>[
'dummy'
]);
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
Platform:
()
=>
platform
,
},
initializeFlutterRoot:
false
);
group
(
'version'
,
()
{
testUsingContext
(
'checks that Flutter toJson output reports the flutter framework version'
,
()
async
{
final
ProcessResult
result
=
ProcessResult
(
0
,
0
,
'random'
,
'0'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment