Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
provision
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
provision
Commits
4e9afd1a
Commit
4e9afd1a
authored
Dec 10, 2009
by
anarcat
Committed by
anarcat
Dec 10, 2009
Browse files
Options
Downloads
Patches
Plain Diff
#597738
- don't install over already installed sites
we do it the proper way, by using site_exists(), not site_installed()
parent
d8acce08
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
db_server/install.provision.inc
+3
-1
3 additions, 1 deletion
db_server/install.provision.inc
platform/install.provision.inc
+6
-6
6 additions, 6 deletions
platform/install.provision.inc
with
9 additions
and
7 deletions
db_server/install.provision.inc
+
3
−
1
View file @
4e9afd1a
...
...
@@ -15,5 +15,7 @@ function drush_provision_mysql_pre_provision_install($url = NULL) {
}
function
drush_provision_mysql_pre_provision_install_rollback
(
$url
=
NULL
)
{
if
(
!
_provision_drupal_site_installed
(
$url
))
{
_provision_mysql_destroy_site_db
(
drush_get_option
(
'db_name'
),
drush_get_option
(
'db_user'
),
drush_get_option
(
'db_passwd'
));
}
}
This diff is collapsed.
Click to expand it.
platform/install.provision.inc
+
6
−
6
View file @
4e9afd1a
...
...
@@ -18,8 +18,8 @@ function drush_provision_drupal_provision_install_validate($url) {
if
(
!
$url
)
{
return
drush_set_error
(
"PROVISION_URL_REQUIRED"
,
dt
(
"You need to specify a valid url to install a site"
));
}
if
(
drush_get_option
(
'installed'
))
{
drush_set_error
(
'PROVISION_SITE_INSTALLED'
);
if
(
_provision_drupal_site_exists
(
$url
))
{
return
drush_set_error
(
'PROVISION_SITE_INSTALLED'
);
}
}
...
...
@@ -52,14 +52,14 @@ function drush_provision_drupal_provision_install($url) {
* If the install went south, and the site is not PROVISION_SITE_INSTALLED, clean up behind ourselves
*/
function
drush_provision_drupal_provision_install_rollback
(
$url
)
{
if
(
!
drush_cmp_error
(
'PROVISION_SITE_INSTALLED'
))
{
if
(
$url
)
{
if
(
!
_provision_drupal_site_installed
(
$url
))
{
_provision_recursive_delete
(
"sites/
$url
"
);
}
}
else
{
drush_set_error
(
'PROVISION_FRAMEWORK_ERROR'
,
dt
(
'no url defined in %function'
,
array
(
'%function'
=>
__FUNCTION__
)));
}
}
}
/**
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment