From bddba1540308206bd8b37e0fec88db77a9de9e8d Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Tue, 13 Feb 2018 11:01:11 +0000 Subject: [PATCH] Cleanup target build directory before building into it... SVN:trunk[5345] --- .../hubruntimeenvironment.class.inc.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/datamodels/2.x/itop-hub-connector/hubruntimeenvironment.class.inc.php b/datamodels/2.x/itop-hub-connector/hubruntimeenvironment.class.inc.php index 5b7b18d267..37feb54570 100644 --- a/datamodels/2.x/itop-hub-connector/hubruntimeenvironment.class.inc.php +++ b/datamodels/2.x/itop-hub-connector/hubruntimeenvironment.class.inc.php @@ -12,10 +12,14 @@ class HubRunTimeEnvironment extends RunTimeEnvironment if ($sEnvironment != $this->sTargetEnv) { - if (is_dir(APPROOT.'/data/'.$this->sTargetEnv.'-modules')) - { - SetupUtils::rrmdir(APPROOT.'/data/'.$this->sTargetEnv.'-modules'); - } + if (is_dir(APPROOT.'/env-'.$this->sTargetEnv)) + { + SetupUtils::rrmdir(APPROOT.'/env-'.$this->sTargetEnv); + } + if (is_dir(APPROOT.'/data/'.$this->sTargetEnv.'-modules')) + { + SetupUtils::rrmdir(APPROOT.'/data/'.$this->sTargetEnv.'-modules'); + } SetupUtils::copydir(APPROOT.'/data/'.$sEnvironment.'-modules', APPROOT.'/data/'.$this->sTargetEnv.'-modules'); } }