Via #2180053: Include more "golden" contrib some modules were added to the Aegir default makefile.

We need to clear these out of site specific dirs while upgrading to avoid errors like:

Error: Cannot redeclare hosting_task_git_pull_form() (previously declared in
/var/aegir/hostmaster-7.x-3.x/profiles/hostmaster/modules/hosting_git/pull/hosting_git_pull.module:83) in
/var/aegir/hostmaster-7.x-3.x/sites/aegir.example.com/modules/hosting_site_git/hosting_site_git.module, line 101
PHP Fatal error:  Cannot redeclare hosting_task_git_pull_form() (previously declared in /var/aegir/hostmaster-7.x-3.x/profiles/hostmaster/mod
ules/hosting_git/pull/hosting_git_pull.module:83) in /data/aegir/hostmaster-7.x-3.x/sites/aegir.example.com/modules/hosting_site_git/hosting_site_git.module on line 101

In this case the new hosting_git module conflicts with the old hosting_site_git and hosting_git_pull. Which results in a fatal.

Were the module name the same then the site specific version would override the platform version, resulting in a disabled module.

In both cases we have to Document and facilitate this cleanup.

The easiest option would be to just uninstall them pre upgrade ... but that would break the ability to rollback on failure.

CommentFileSizeAuthor
#1 upgrade_remove_site-2353499-1.patch845 byteshelmo
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

helmo’s picture

I also noticed that hosting_git uses another database table then hosting_site_git and hosting_git_pull from devshop ... where we have no upgrade functions at the moment.

Thus... disabling and uninstalling before starting the upgrade is by far the safest option.

I was working on some code for upgrade.sh, but guess that it's only usefull for hosting_platform_pathauto. See patch.