Named placeholders aren't allowed in D6's db_query, and the data fetcher needs to be different.

CommentFileSizeAuthor
#7 hosting_remote_import-aegir2_compat-2538788-7.patch6.17 KBkienan
#6 hosting_remote_import-aegir2_compat-2538788-6.patch4.5 KBergonlogic
#5 hosting_remote_import-2538788-2-aegir2_compatibility.patch5.21 KBgboudrias
hosting_remote_import_aegir2_compatiblity.patch5.21 KBgboudrias
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

gboudrias’s picture

gboudrias CreditAttribution: gboudrias at Praxis Labs Coop commented
Status: Active » Needs review

Forgot to mark this as "needs review". Can probably wait until 3.2.

ergonlogic’s picture

ergonlogic
he/him
Primary language English
Location Montréal, Québec 🇨🇦
CreditAttribution: ergonlogic commented
Priority: Normal » Critical

So this is to allow Aegir3 to import sites from Aegir2? I'm marking this critical, as this is our recommended upgrade path from 2 to 3. Shouldn't block a 3.1 release.

gboudrias’s picture

gboudrias CreditAttribution: gboudrias at Praxis Labs Coop commented

Yeah as far as I can tell Aegir2 -> Aegir3 imports won't work without this patch.

ergonlogic’s picture

ergonlogic
he/him
Primary language English
Location Montréal, Québec 🇨🇦
CreditAttribution: ergonlogic commented

Looks like there a missing EOL on that patch, as I got:

$ git apply hosting_remote_import_aegir2_compatiblity.patch
fatal: corrupt patch at line 108
gboudrias’s picture

gboudrias CreditAttribution: gboudrias at Praxis Labs Coop commented
FileSize
hosting_remote_import-2538788-2-aegir2_compatibility.patch5.21 KB

Weird, here's the updated version.

ergonlogic’s picture

ergonlogic
he/him
Primary language English
Location Montréal, Québec 🇨🇦
CreditAttribution: ergonlogic commented
FileSize
hosting_remote_import-aegir2_compat-2538788-6.patch4.5 KB

Upon testing this, it looks like it always defaults to the remote being Aegir 2. Rather than the regex, I switched to pulling out the 'aegir_api' variable directly. Also, the check for $platform being set could mask other problems, so I dropped that as well.

I've posted an updated patch that works for me. I also pushed a new branch with the same fix: dev/2538788.

kienan’s picture

kienan CreditAttribution: kienan commented
FileSize
hosting_remote_import-aegir2_compat-2538788-7.patch6.17 KB

The string returned by the remote call isn't simply 2 or 3 against the server I'm testing against (6.x-2.5)

string(13) "aegir_api: 2
"
Remote Aegir API version: aegir_api: 2                                                                                                                                                                     [notice]
 [1.02 sec, 9.93 MB]
Remote import only supports importing from Aegir 2 or Aegir 3 remotes. The API version received was: aegir_api: 2                                                                                       [error]
 [1.02 sec, 9.94 MB]

I re-rolled the patch to handle cases where it's the varname: value in response.

  • ergonlogic committed 29cb4a9 on 7.x-3.x 
    Issue #2538788 by gboudrias and ergonlogic: Allow imports from both...
  • ergonlogic committed c21abbb on 7.x-3.x authored by kienan
    Issue #2538788 by kienan: Fix Aegir2 support for older versions of Drush...
ergonlogic’s picture

ergonlogic
he/him
Primary language English
Location Montréal, Québec 🇨🇦
CreditAttribution: ergonlogic at Ergon Logic Enterprises for Aegir Cooperative commented
Status: Needs review » Fixed

Merged the dev/2538788 branch that had the patch from #6 and added @kienan's contribution that supports older versions of Drush.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.