In #1211008: Split field_bundle_settings out per bundle the horrible field_bundle_settings variable is being split up per entity bundle and the function update_media_7016 needs to be updated accordingly.

#10 1418708_9_media_mymodule.patch480 bytesscor
#5 1418708-field-bundle_settings-update.patch3.38 KBDave Reid
PASSED: [[SimpleTest]]: [MySQL] 11 pass(es). View
#2 media-1418708-2.patch2.39 KBtim.plunkett
PASSED: [[SimpleTest]]: [MySQL] 0 pass(es). View


Dave Reid’s picture

Priority: Normal » Major
Issue tags: +D7 stable release blocker, +Needs backport to 1.x
tim.plunkett’s picture

Status: Active » Needs review
2.39 KB
PASSED: [[SimpleTest]]: [MySQL] 0 pass(es). View

How about this?

Dave Reid’s picture

It looks like we're missing a critical piece that this update function requires field_update_7002() to run first.

Dave Reid’s picture

Status: Needs review » Needs work
Dave Reid’s picture

Status: Needs work » Needs review
3.38 KB
PASSED: [[SimpleTest]]: [MySQL] 11 pass(es). View

Revised patch with media_update_dependencies().

aaron’s picture

Status: Needs review » Reviewed & tested by the community

okay this works. I had to do some sleuthing to get it, here are the steps that I used:

git clone --recursive --branch 7.x
cd drupal
git checkout 7.12
cd sites/all/modules
git clone --branch 7.x-1.x
git clone --branch 7.x-1.x
cd media
git checkout 3ae599fe9f2cdb3780b20ab64c8fb1bb6bc541dd

* install the site, and enable the media module (after moving 3 include files, because that specific commit was broken, and I didn't feel like going back further)

git stash
git checkout 7.x-2.x
git apply -v 1418708-field-bundle_settings-update.patch
cd ..
git clone --branch 7.x-2.x
git clone --branch 7.x-1.x
git clone --branch 7.x-3.x
cd ../../../
git checkout 7.14

* run all updates

Dave Reid’s picture

Status: Reviewed & tested by the community » Fixed

Status: Fixed » Closed (fixed)

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

scor’s picture

Status: Closed (fixed) » Needs work
+++ b/media.install
@@ -190,6 +190,20 @@ function media_uninstall() {
+  $dependencies['mymodule'][7016] = array(

Does this actually work?

patch untested.

scor’s picture

480 bytes
Dave Reid’s picture

Status: Needs work » Closed (fixed)
Issue tags: -Needs backport to 1.x