diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-06-04 13:05:17 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-06-05 12:19:24 +0000 |
| commit | 25cec515bbabe4acbc84e05ed3725f06fbe89d90 (patch) | |
| tree | e1a9afc244b4cf135f85b3d5a2afa48e359bc890 /morphlib/app.py | |
| parent | 4fbce4c4119241f5bb7bcb8e39588262605bc619 (diff) | |
| download | morph-25cec515bbabe4acbc84e05ed3725f06fbe89d90.tar.gz | |
S7904: Move cache settings to storage options
Diffstat (limited to 'morphlib/app.py')
| -rw-r--r-- | morphlib/app.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/morphlib/app.py b/morphlib/app.py index 0d8b1047..47dc02bf 100644 --- a/morphlib/app.py +++ b/morphlib/app.py @@ -53,15 +53,6 @@ class Morph(cliapp.Application): self.settings.boolean(['quiet', 'q'], 'show no output unless there is an error') - self.settings.string(['cachedir'], - 'cache git repositories and build results in DIR', - metavar='DIR', - default=defaults['cachedir']) - self.settings.string(['compiler-cache-dir'], - 'cache compiled objects in DIR/REPO. If not ' - 'provided, defaults to CACHEDIR/ccache/', - metavar='DIR', - default=None) self.settings.string(['build-ref-prefix'], 'Prefix to use for temporary build refs', metavar='PREFIX', @@ -120,6 +111,8 @@ class Morph(cliapp.Application): 'always push temporary build branches to the ' 'remote repository', group=group_build) + + group_storage = 'Storage Options' self.settings.string(['tempdir'], 'temporary directory to use for builds ' '(this is separate from just setting $TMPDIR ' @@ -129,7 +122,18 @@ class Morph(cliapp.Application): 'NFS)', metavar='DIR', default=os.environ.get('TMPDIR'), - group=group_build) + group=group_storage) + self.settings.string(['cachedir'], + 'cache git repositories and build results in DIR', + metavar='DIR', + group=group_storage, + default=defaults['cachedir']) + self.settings.string(['compiler-cache-dir'], + 'cache compiled objects in DIR/REPO. If not ' + 'provided, defaults to CACHEDIR/ccache/', + metavar='DIR', + group=group_storage, + default=None) # These cannot be removed just yet because existing morph.conf files # would fail to parse. |