1279564 - Move state directory creation code from mach_bootstrap.py into python/mozboot

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Gregory Szorc [:gps]]

Bug 1277406 introduced duplication of code for the state directory. We should make the canonical home under python/mozboot and have mach_bootstrap.py import and use that code.

Comment 1

[Gregory Szorc [:gps]]

Attachment: Bug 1279564 - Move get_state_dir() to own module;

We'll be consolidating code from mach_bootstrap.py and mozboot.
We don't want mach_bootstrap.py to import bootstrap.py because it
imports nearly every module under mozboot. So establish a standalone
module with minimal dependencies to hold utility code. Move
get_state_dir() there.

Review commit: https://reviewboard.mozilla.org/r/58994/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/58994/

Comment 2

[Gregory Szorc [:gps]]

Attachment: Bug 1279564 - Return a 2-tuple from get_state_dir();

This matches the implementation from mach_bootstrap.py.

Review commit: https://reviewboard.mozilla.org/r/58996/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/58996/

Comment 3

[Gregory Szorc [:gps]]

Attachment: Bug 1279564 - Use get_state_dir() from mozboot;

Import mozboot.util and use the function from there.

Review commit: https://reviewboard.mozilla.org/r/58998/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/58998/

Comment 4

[Mike Hommey [:glandium]]

Comment on attachment 8762115 [details]
Bug 1279564 - Move get_state_dir() to own module;

https://reviewboard.mozilla.org/r/58994/#review56278

Comment 5

[Mike Hommey [:glandium]]

Comment on attachment 8762116 [details]
Bug 1279564 - Return a 2-tuple from get_state_dir();

https://reviewboard.mozilla.org/r/58996/#review56280

::: python/mozboot/mozboot/bootstrap.py:214
(Diff revision 1)
>          # The state directory code is largely duplicated from mach_bootstrap.py.
>          # We can't easily import mach_bootstrap.py because the bootstrapper may
>          # run in self-contained mode and only the files in this directory will
>          # be available. We /could/ refactor parts of mach_bootstrap.py to be
>          # part of this directory to avoid the code duplication.
> -        state_dir = get_state_dir()
> +        state_dir = get_state_dir()[0]

state_dir, _ = get_state_dir() ?

Comment 6

[Mike Hommey [:glandium]]

Comment on attachment 8762117 [details]
Bug 1279564 - Use get_state_dir() from mozboot;

https://reviewboard.mozilla.org/r/58998/#review56282

Comment 7

[Mike Hommey [:glandium]]

It feels to me something should be done about STATE_DIR_FIRST_RUN and STATE_DIR_INFO.

Comment 8

[Gregory Szorc [:gps]]

Comment on attachment 8762115 [details]
Bug 1279564 - Move get_state_dir() to own module;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/58994/diff/1-2/

Comment 9

[Gregory Szorc [:gps]]

Comment on attachment 8762116 [details]
Bug 1279564 - Return a 2-tuple from get_state_dir();

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/58996/diff/1-2/

Comment 10

[Gregory Szorc [:gps]]

Comment on attachment 8762117 [details]
Bug 1279564 - Use get_state_dir() from mozboot;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/58998/diff/1-2/

Comment 11

[Gregory Szorc [:gps]]

https://hg.mozilla.org/integration/autoland/pushloghtml?changeset=2812ef2db597

Comment 12

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/910bb13e5929
Move get_state_dir() to own module; r=glandium
https://hg.mozilla.org/integration/autoland/rev/cc353a894d96
Return a 2-tuple from get_state_dir(); r=glandium

Comment 13

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/910bb13e5929
https://hg.mozilla.org/mozilla-central/rev/cc353a894d96
https://hg.mozilla.org/mozilla-central/rev/2812ef2db597