Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Commit d9a3f1b

Browse files
committed
Fixing repo_root path.
1 parent 35cacd7 commit d9a3f1b

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/Robo/Commands/Blt/DoctorCommand.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,12 @@ public function doctor() {
6464
protected function executeDoctorInsideVm() {
6565
$drupal_vm_config_filepath = $this->getConfigValue('repo.root') . '/box/config.yml';
6666
$drupal_vm_config = Yaml::parse(file_get_contents($drupal_vm_config_filepath));
67-
$repo_root = $drupal_vm_config['drupal_core_path'];
67+
$repo_root = $drupal_vm_config['drupal_core_path'] . '/..';
6868
if (strstr($repo_root, '{{')) {
69-
throw new \Exception("The value of drupal_core_path in $drupal_vm_config_filepath contains an unresolved Ansible variable. Please do not use Ansible variable placeholders for drupal_core_path. BLT cannot resolve them.");
69+
$this->logger->error("The value of drupal_core_path in $drupal_vm_config_filepath contains an unresolved Ansible variable.");
70+
$this->logger->error("Do not use Ansible variable placeholders for drupal_core_path.");
71+
$this->logger->error("drupal_core_path is currently $drupal_vm_config_filepath. Please correct it.");
72+
throw new \Exception("Unparsable value in $drupal_vm_config_filepath.");
7073
}
7174

7275
$this->say("Drupal VM was detected. Running blt doctor inside of VM...");

src/Robo/Hooks/CommandEventHook.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ protected function escapeShellArg($arg) {
9090
* TRUE if it should be invoked inside of Drupal VM.
9191
*/
9292
protected function shouldExecuteInDrupalVm() {
93-
return $this->getInspector()->isDrupalVmLocallyInitialized()
94-
&& $this->getInspector()->isDrupalVmBooted()
95-
&& !$this->getInspector()->isVmCli();
93+
return !$this->getInspector()->isVmCli() &&
94+
$this->getInspector()->isDrupalVmLocallyInitialized()
95+
&& $this->getInspector()->isDrupalVmBooted();
9696
}
9797

9898
}

0 commit comments

Comments
 (0)