1264050 - The distribution/default directory should be checked even if there are no mcc or mnc directories

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: Android partner distribution, defect)

Description

[Mike Kaply [:mkaply]]

We should look in the distribution/default directory for distribution files in all cases (not just if mcc and mnc is present).

That way we can present one common layout for the distribution directory.

Comment 1

[Mike Kaply [:mkaply]]

Attachment: Always check the default directory

This adds the default directory to the list of distribution directories.

I also changed the error message for missing files to include the path. Makes debugging easier.

Comment 2

[Mark Finkle (:mfinkle) (use needinfo?)]

(In reply to Mike Kaply [:mkaply] from comment #1)
> Created attachment 8740608 [details] [diff] [review]
> Always check the default directory
> 
> This adds the default directory to the list of distribution directories.
> 
> I also changed the error message for missing files to include the path.
> Makes debugging easier.

It makes debugging easier, but it might push more data than we want into the log. For privacy and security reasons, we avoid logging URLs and file paths, particularly file paths that include the profile folder name. Not sure what the file path is here, but "when in doubt, leave it out".

Yes, I just made that up.

Comment 3

[Mike Kaply [:mkaply]]

That's funny. As I checked it in, I thought, "Should we be putting the username/profile in the log?"

You're right. I'll do a new patch.

Comment 4

[Sebastian Kaspari (:sebastian; :pocmo)]

Comment on attachment 8740608 [details] [diff] [review]
Always check the default directory

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

Makes sense.

If you create a distribution bundle[1] and we can't read the SIM card data then we should look into /default.

[1] https://wiki.mozilla.org/Mobile/Distribution_Files#Distribution_bundles

Comment 5

[Mike Kaply [:mkaply]]

https://hg.mozilla.org/integration/fx-team/rev/6ef7f0a7ea41dcfd74ae70abe36fd03610e6bfec
Bug 1264050 - Use distribution/defaults directory even if is no SIM card data; r=sebastian

Comment 6

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/6ef7f0a7ea41