revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-09-20 08:58:55 +02:00
Code Issues Releases Wiki Activity

Fix checking for flake8 path

Browse source 
Test Plan:
  $ arc unit # without flake8 in path

Reviewers: zeeg

Reviewed By: zeeg

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D4379
This commit is contained in:
vrana 2013-01-09 13:37:08 -08:00
parent d399354822
commit 983537e620
1 changed files with 21 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/lint/linter/ArcanistFlake8Linter.php
View file

@ -27,38 +27,30 @@ final class ArcanistFlake8Linter extends ArcanistLinter {
public function getFlake8Path() {
$working_copy = $this->getEngine()->getWorkingCopy();
$prefix = $working_copy->getConfig('lint.flake8.prefix');
$bin = $working_copy->getConfig('lint.flake8.bin');
$bin = $working_copy->getConfig('lint.flake8.bin', 'flake8');
if ($bin === null && $prefix === null) {
$bin = 'flake8';
} else {
if ($bin === null) {
$bin = 'flake8';
}
if ($prefix !== null) {
if (!Filesystem::pathExists($prefix.'/'.$bin)) {
throw new ArcanistUsageException(
"Unable to find flake8 binary in a specified directory. Make sure ".
"that 'lint.flake8.prefix' and 'lint.flake8.bin' keys are set ".
"correctly. If you'd rather use a copy of flake8 installed ".
"globally, you can just remove these keys from your .arcconfig");
}
$bin = csprintf("%s/%s", $prefix, $bin);
return $bin;
}
// Look for globally installed flake8
list($err) = exec_manual('which %s', $bin);
if ($err) {
if ($prefix !== null) {
if (!Filesystem::pathExists($prefix.'/'.$bin)) {
throw new ArcanistUsageException(
"flake8 does not appear to be installed on this system. Install it ".
"(e.g., with 'easy_install flake8') or configure ".
"'lint.flake8.prefix' in your .arcconfig to point to the directory ".
"where it resides.");
"Unable to find flake8 binary in a specified directory. Make sure ".
"that 'lint.flake8.prefix' and 'lint.flake8.bin' keys are set ".
"correctly. If you'd rather use a copy of flake8 installed ".
"globally, you can just remove these keys from your .arcconfig");
}
$bin = csprintf("%s/%s", $prefix, $bin);
return $bin;
}
// Look for globally installed flake8
list($err) = exec_manual('which %s', $bin);
if ($err) {
throw new ArcanistUsageException(
"flake8 does not appear to be installed on this system. Install it ".
"(e.g., with 'easy_install flake8') or configure ".
"'lint.flake8.prefix' in your .arcconfig to point to the directory ".
"where it resides.");
}
return $bin;