Skip to content

Fix the six package detection in release #2748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 27, 2017
Merged

Fix the six package detection in release #2748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions lib/services/doctor-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,17 +219,18 @@ class DoctorService implements IDoctorService {
let hasInvalidPackages = false;
if (this.$hostInfo.isDarwin) {
try {
let queryForSixPackage = await this.$childProcess.exec(`pip freeze | grep '^six=' | wc -l`);
let sixPackagesFoundCount = parseInt(queryForSixPackage);
if (sixPackagesFoundCount === 0) {
await this.$childProcess.exec(`python -c "import six"`);
} catch (error) {
// error.code = 1 so the Python is present, but we don't have six.
if (error.code === 1) {
hasInvalidPackages = true;
this.$logger.warn("The Python 'six' package not found.");
this.$logger.out("This package is required by the Debugger library (LLDB) for iOS. You can install it by running 'pip install six' from the terminal.");
} else {
this.$logger.warn("Couldn't retrieve installed python packages.");
this.$logger.out("We cannot verify your python installation is setup correctly. Please, make sure you have both 'python' and 'pip' installed.");
this.$logger.trace(`Error while validating Python packages. Error is: ${error.message}`);
}
} catch (error) {
this.$logger.warn("Couldn't retrieve installed python packages.");
this.$logger.out("We cannot verify your python installation is setup correctly. Please, make sure you have both 'python' and 'pip' installed.");
this.$logger.trace(`Error while validating Python packages. Error is: ${error.message}`);
}
}
return hasInvalidPackages;
Expand Down