1606974 - UpdateVerify failures macOS beta 72

Status: RESOLVED FIXED

(Thunderbird :: Build Config, defect)

Description

[Rob Lemley [:rjl]]

Update Verify fails on 72 beta for macOS only on some tests.

The problem stems from bug 1482788 which involved some extra files to added to the macOS DMG files during the signing process that were not tracked by the installer/updater.

Bug 1568654 fixed that by adding those files to removed-files so the updater would remove them.
Except it was fixed incorrectly.

Analyzing the update manifests in the macOS MAR file for 72.0b3, these commands are listed towards the end of the file:

remove "Thunderbird.app/Contents/Library/Spotlight/thunderbird.mdimporter/Contents/_CodeSignature/._CodeResources"
remove "Thunderbird.app/Contents/Library/Spotlight/thunderbird.mdimporter/Contents/Resources/English.lproj/._schema.strings"
remove "Thunderbird.app/Contents/Library/Spotlight/thunderbird.mdimporter/Contents/Resources/English.lproj/._InfoPlist.strings"
remove "Thunderbird.app/Contents/Library/Spotlight/thunderbird.mdimporter/Contents/Resources/._schema.xml"
remove "Thunderbird.app/Contents/Library/Spotlight/thunderbird.mdimporter/Contents/._Info.plist"

The rest of the commands in the update manifests do not have "Thunderbird.app" prefixing the rest of the target path:

add "Contents/MacOS/crashreporter.app/Contents/MacOS/crashreporter"
add "Contents/MacOS/crashreporter.app/Contents/Info.plist"
add "Contents/MacOS/XUL"
add "Contents/Library/Spotlight/thunderbird.mdimporter/Contents/_CodeSignature/CodeResources"
add "Contents/Library/Spotlight/thunderbird.mdimporter/Contents/Resources/schema.xml"

Looking at removed-files.in the entries for removing these files are created like:

@APPNAME@/Contents/Library/Spotlight/thunderbird.mdimporter/Contents/_CodeSignature/._CodeResources

Apparently, while using the @APPNAME@ macro in package-manifest.in is appropriate, it is not needed in removed-files.in. There are macros and examples for how to remove files from Contents/MacOS and Contents/Resources, but not Contents/Library thus the confusion.

The fix should be just to remove "@APPNAME/" from those entries.

Comment 1

[Rob Lemley [:rjl]]

Attachment: bug1609674_UV_macos.patch

To verify this fix, I ran a try job and had it generate a MAR file from it.
Then, I unpacked this file and examined the updatev{2,3}.manifest files
within. The "Thunderbird.app" prefix is no longer present. That should
take care of these errors!

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/fae5cbb0e5a6
Remove @APPNAME@/ prefix from removed-files.in. r=darktrojan

Comment 3

[Geoff Lankow (:darktrojan)]

Comment on attachment 9118632 [details] [diff] [review]
bug1609674_UV_macos.patch

I assume this is wanted on beta, given what it's for.

Comment 4

[Rob Lemley [:rjl]]

Comment on attachment 9118632 [details] [diff] [review]
bug1609674_UV_macos.patch

It actually should go on c-esr68 as well since the files that this is trying to remove don't actually get removed like they should. The test just doesn't complain there.

Comment 5

[Geoff Lankow (:darktrojan)]

73 beta 1:
https://hg.mozilla.org/releases/comm-beta/rev/6a6d427d1bd3089991f202b850a1e4481c233ee9

Comment 6

[Geoff Lankow (:darktrojan)]

68.4.2:
https://hg.mozilla.org/releases/comm-esr68/rev/fa98c3cb44b95a2ffa1b56a3bed2328bbcee22aa