Merge remote-tracking branch 'origin/slapformat'

9c0d587c · Cédric de Saint Martin · 2d8c4212 · 87663a71 · 9c0d587c · 9c0d587c
Commit 9c0d587c authored Feb 08, 2013 by Cédric de Saint Martin
Expand all Show whitespace changes
Inline Side-by-side

Showing with 240 additions and 165 deletions

slapos/entry.py slapos/entry.py +1 -0

slapos/format.py slapos/format.py +239 -165

No files found.
--- a/slapos/entry.py
+++ b/slapos/entry.py
@@ -115,6 +115,7 @@ def dispatch(command, is_node_command):
  If configuration file is not given: define it arbitrarily, and so on.
  """
  if is_node_command:
+    # XXX-Cedric: should we check if we are root?
    if command == 'register':
      call(register)
    elif command == 'software':

--- a/slapos/format.py
+++ b/slapos/format.py