Skip to content
GitLab
About GitLab
GitLab: the DevOps platform
Explore GitLab
Install GitLab
How GitLab compares
Get started
GitLab docs
GitLab Learn
Pricing
Talk to an expert
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Projects
Groups
Snippets
Sign up now
Login
Sign in
Toggle navigation
Menu
Open sidebar
project
provision
Commits
1cb848cb
Commit
1cb848cb
authored
Dec 20, 2014
by
Grazyna Jaworska
Browse files
Compare $new_uri with d()->name and not d()->uri in the Site Rename Check.
parent
f56ee17d
Changes
1
Hide whitespace changes
Inline
Side-by-side
platform/migrate.provision.inc
View file @
1cb848cb
...
...
@@ -31,7 +31,7 @@ function drush_provision_drupal_pre_provision_migrate($platform, $new_uri = NULL
drush_set_option
(
'old_platform'
,
d
()
->
platform
->
name
);
// If we are renaming the site, pick this up early.
if
(
!
is_null
(
$new_uri
)
&&
(
$new_uri
!=
d
()
->
uri
))
{
if
(
!
is_null
(
$new_uri
)
&&
(
$new_uri
!=
d
()
->
name
))
{
drush_set_option
(
'target_name'
,
$new_uri
);
}
else
{
...
...
@@ -81,7 +81,7 @@ function drush_provision_drupal_provision_migrate($platform, $new_uri = NULL) {
$options
[
'uri'
]
=
d
()
->
uri
;
if
(
!
is_null
(
$new_uri
)
&&
(
$new_uri
!=
d
()
->
uri
))
{
if
(
!
is_null
(
$new_uri
)
&&
(
$new_uri
!=
d
()
->
name
))
{
$options
=
d
()
->
options
;
$options
[
'uri'
]
=
ltrim
(
$new_uri
,
'@'
);
$hash_name
=
drush_get_option
(
'#name'
)
?
'#name'
:
'name'
;
...
...
@@ -137,7 +137,7 @@ function drush_provision_drupal_post_provision_migrate($platform, $new_uri = NUL
if
(
!
is_null
(
$new_uri
)
&&
(
$new_uri
!=
d
()
->
uri
))
{
if
(
!
is_null
(
$new_uri
)
&&
(
$new_uri
!=
d
()
->
name
))
{
// remove the existing alias
$config
=
new
Provision_Config_Drushrc_Alias
(
d
()
->
name
);
$config
->
unlink
();
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment