[PATCH 2/7] S7904: Move cache settings to storage options

Richard Maw richard.maw at codethink.co.uk
Tue Jun 4 17:52:42 BST 2013


---
 morphlib/app.py |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/morphlib/app.py b/morphlib/app.py
index 267dab1..b4a036c 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.
-- 
1.7.10.4




More information about the baserock-dev mailing list