[Python-apps-commits] r9516 - in packages/slapos.core/trunk/debian (2 files)

[arnau at users.alioth.debian.org]

    Date: Wednesday, March 27, 2013 @ 08:12:26
  Author: arnau
Revision: 9516

Fix string formatting error introduced by debian/patches/slapos_command_split_up.patch.

Modified:
  packages/slapos.core/trunk/debian/changelog
  packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2013-03-27 08:06:33 UTC (rev 9515)
+++ packages/slapos.core/trunk/debian/changelog	2013-03-27 08:12:26 UTC (rev 9516)
@@ -1,3 +1,10 @@
+slapos.core (0.35.1-4) UNRELEASED; urgency=low
+
+  * debian/patches/slapos_command_split_up.patch:
+    + Fix string formatting error introduced by this patch.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Wed, 27 Mar 2013 17:11:06 +0900
+
 slapos.core (0.35.1-3) unstable; urgency=low
 
   * debian/control, debian/pydist-overrides,

Modified: packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch	2013-03-27 08:06:33 UTC (rev 9515)
+++ packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch	2013-03-27 08:12:26 UTC (rev 9516)
@@ -4,10 +4,8 @@
  The Debian package is split up into two packages, thus ``slapos node ...''
  subcommands are not available if slapos-node-unofficial is not installed.
 
-Index: slapos.core-0.35.1/slapos/entry.py
-===================================================================
---- slapos.core-0.35.1.orig/slapos/entry.py	2013-02-28 19:37:20.367336189 +0900
-+++ slapos.core-0.35.1/slapos/entry.py	2013-02-28 19:39:26.704642605 +0900
+--- a/slapos/entry.py
++++ b/slapos/entry.py
 @@ -30,19 +30,26 @@
  import ConfigParser
  import os
@@ -56,7 +54,7 @@
  
    usage = """SlapOS %s command line interface.
  For more informations, refer to SlapOS documentation.
-+"""
++""" % version
  
 +  if SLAPOS_CLIENT_ONLY:
 +    usage += """
@@ -77,3 +75,12 @@
  Node subcommands usage:
    slapos node
    slapos node register <node-id>
+@@ -201,7 +220,7 @@
+   slapos node status <process>
+   slapos node supervisorctl
+   slapos node supervisord
+-""" % version
++"""
+ 
+   # Parse arguments
+   # XXX remove the "positional arguments" from help message