Closed Bug 1068439 Opened 7 years ago Closed 7 years ago

Move the distribution directory from Content/MacOS to Contents/Resources on app update due to v2 signing requirements

Categories

(Toolkit :: Application Update, defect)

All
macOS
defect
Not set
normal

Tracking

()

RESOLVED FIXED
mozilla35
Tracking Status
firefox34 --- fixed
firefox35 --- fixed

People

(Reporter: robert.strong.bugs, Assigned: robert.strong.bugs)

References

Details

Attachments

(2 files, 1 obsolete file)

As the summary states
Attached patch Patch rev1 (obsolete) — Splinter Review
Attachment #8491233 - Flags: review?(netzen)
I can only reproduce the failures on the try push when I am using the old maintenance service so it appears that the one that is being compiled is not replacing the existing one on the system. :(
Another try push that tries to copy the build's maintenance service into the maintenance service directory. This will throw except for the first test if the bytes of the build's maintenance service don't match the bytes of the installed maintenance service.
https://tbpl.mozilla.org/?tree=Try&rev=487e61ace192
Oak looks good as well besides the service issues
https://tbpl.mozilla.org/?tree=Oak&rev=6f35795603f7
Comment on attachment 8491233 [details] [diff] [review]
Patch rev1

Review of attachment 8491233 [details] [diff] [review]:
-----------------------------------------------------------------

Looks great, just a couple nits. r=spohl with that.

::: toolkit/mozapps/update/tests/unit_aus_update/head_update.js
@@ +1060,5 @@
>  }
>  
>  /**
> + * Helper function for updater binary tests that prevents the distribution
> + * directory files from bein created.

nit: 'being'

::: toolkit/mozapps/update/tests/unit_base_updater/marStageSuccessPartial.js
@@ +103,5 @@
> +
> +    checkUpdateLogContains("Moving old distribution directory to new location");
> +  } else {
> +    logTestInfo("testing that files added with an add-if instruction when " +
> +                "the destination directory doesn't exist");

nit: this sentence doesn't seem to make sense as it stands. maybe something like "testing that files don't exist that were added with an add-if instruction when the destination directory doesn't exist"?

::: toolkit/mozapps/update/tests/unit_base_updater/marSuccessComplete.js
@@ +83,5 @@
> +
> +    checkUpdateLogContains("Moving old distribution directory to new location");
> +  } else {
> +    logTestInfo("testing that files added with an add-if instruction when " +
> +                "the destination directory doesn't exist");

nit: same

::: toolkit/mozapps/update/updater/updater.cpp
@@ +3032,5 @@
> +    if (!rv) {
> +      NS_tchar newDistDir[MAXPATHLEN];
> +      NS_tsnprintf(newDistDir, sizeof(newDistDir)/sizeof(newDistDir[0]),
> +                   NS_T("%s/Contents/Resources/distribution"), gInstallDirPath);
> +        rv = NS_taccess(newDistDir, F_OK);

nit: fix indent
Attachment #8491233 - Flags: review?(netzen) → review+
Attachment #8491233 - Attachment is obsolete: true
Attachment #8492404 - Flags: review+
Backed out the previous patch from oak and landed the new patch

Backout
https://hg.mozilla.org/projects/oak/rev/53657ba8aec1

Landing
https://hg.mozilla.org/projects/oak/rev/d478d59064cd
https://hg.mozilla.org/mozilla-central/rev/67261da9cb7d
Status: NEW → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla35
Landed on aurora in the Mac V2 signing combined patch in bug 1047584
Flags: qe-verify-
You need to log in before you can comment on or make changes to this bug.