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

arnau at users.alioth.debian.org arnau at users.alioth.debian.org
Fri Sep 7 10:36:25 UTC 2012 

    Date: Friday, September 7, 2012 @ 10:36:24
  Author: arnau
Revision: 9101

New upstream release.

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

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2012-09-06 13:40:41 UTC (rev 9100)
+++ packages/slapos.core/trunk/debian/changelog	2012-09-07 10:36:24 UTC (rev 9101)
@@ -1,3 +1,10 @@
+slapos.core (0.28.5-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    + debian/patches/system_configuration_file_by_default.patch: Update.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Fri, 07 Sep 2012 18:48:21 +0900
+
 slapos.core (0.25-2) unstable; urgency=low
 
   * debian/po/pt.po:

Modified: packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch	2012-09-06 13:40:41 UTC (rev 9100)
+++ packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch	2012-09-07 10:36:24 UTC (rev 9101)
@@ -6,11 +6,11 @@
  on /etc/slapos/slapos-client.cfg and /etc/slapos/slapos-node-unofficial.cfg
  generated upon package installation.
 
-Index: slapos.core-0.25/slapos/format.py
+Index: slapos.core-0.28.5/slapos/format.py
 ===================================================================
---- slapos.core-0.25.orig/slapos/format.py	2012-05-17 03:28:43.000000000 +0900
-+++ slapos.core-0.25/slapos/format.py	2012-05-18 18:22:44.886065063 +0900
-@@ -877,8 +877,10 @@
+--- slapos.core-0.28.5.orig/slapos/format.py	2012-08-23 22:36:33.000000000 +0900
++++ slapos.core-0.28.5/slapos/format.py	2012-09-07 18:52:52.480544479 +0900
+@@ -885,8 +885,10 @@
      else:
        (options, args) = self.parse_args()
      if len(args) != 1:
@@ -23,7 +23,7 @@
  
  def run(config):
    # Define the computer
-@@ -1160,7 +1162,11 @@
+@@ -1193,7 +1195,11 @@
    global os
    global callAndRead
    real_callAndRead = callAndRead
@@ -36,23 +36,19 @@
  
    # Parse arguments
    options, configuration_file_path = Parser(usage=usage).check_args(args)
-Index: slapos.core-0.25/slapos/grid/slapgrid.py
+Index: slapos.core-0.28.5/slapos/grid/slapgrid.py
 ===================================================================
---- slapos.core-0.25.orig/slapos/grid/slapgrid.py	2012-04-24 01:03:33.000000000 +0900
-+++ slapos.core-0.25/slapos/grid/slapgrid.py	2012-05-18 18:23:01.810241291 +0900
-@@ -114,8 +114,9 @@
-   parser.add_argument("--promise-timeout",
-                       type=int, default=3,
-                       help="Promise timeout in seconds.")
--  parser.add_argument("configuration_file", nargs=1, type=argparse.FileType(),
--      help="SlapOS configuration file.")
-+  parser.add_argument("configuration_file", nargs='?', type=argparse.FileType(),
+--- slapos.core-0.28.5.orig/slapos/grid/slapgrid.py	2012-08-22 03:36:10.000000000 +0900
++++ slapos.core-0.28.5/slapos/grid/slapgrid.py	2012-09-07 18:54:22.289535287 +0900
+@@ -110,6 +110,7 @@
+   parser.add_argument("--promise-timeout", type=int, default=3,
+       help="Promise timeout in seconds.")
+   parser.add_argument("configuration_file", nargs=1, type=argparse.FileType(),
 +      default='/etc/slapos/slapos-node-unofficial.cfg',
-+      help="SlapOS configuration file.")
-   parser.add_argument("--maximal_delay", help="The maximal delay value in seconds. " \
-                     "A negative value leads start immediately.")
- 
-@@ -128,7 +128,7 @@
+       help="SlapOS configuration file.")
+   parser.add_argument("--now", action="store_true", default=False,
+       help="Launch slapgrid without delay.")
+@@ -135,7 +136,7 @@
        parser.parse_args(list(argument_tuple))
    # Parses arguments from config file, if needed, then merge previous arguments
    option_dict = {}
@@ -61,11 +57,11 @@
    # Loads config (if config specified)
    slapgrid_configuration = ConfigParser.SafeConfigParser()
    slapgrid_configuration.readfp(configuration_file)
-Index: slapos.core-0.25/slapos/proxy/__init__.py
+Index: slapos.core-0.28.5/slapos/proxy/__init__.py
 ===================================================================
---- slapos.core-0.25.orig/slapos/proxy/__init__.py	2012-02-08 17:03:21.000000000 +0900
-+++ slapos.core-0.25/slapos/proxy/__init__.py	2012-05-18 18:22:44.886065063 +0900
-@@ -38,9 +38,11 @@
+--- slapos.core-0.28.5.orig/slapos/proxy/__init__.py	2012-08-22 03:36:10.000000000 +0900
++++ slapos.core-0.28.5/slapos/proxy/__init__.py	2012-09-07 18:52:52.480544479 +0900
+@@ -67,9 +67,11 @@
      """
      (options, args) = self.parse_args()
      if len(args) != 1:
@@ -79,11 +75,11 @@
  
  class Config:
    def setConfig(self, option_dict, configuration_file_path):
-Index: slapos.core-0.25/slapos/grid/svcbackend.py
+Index: slapos.core-0.28.5/slapos/grid/svcbackend.py
 ===================================================================
---- slapos.core-0.25.orig/slapos/grid/svcbackend.py	2012-02-08 17:03:21.000000000 +0900
-+++ slapos.core-0.25/slapos/grid/svcbackend.py	2012-05-18 18:22:44.886065063 +0900
-@@ -124,6 +124,8 @@
+--- slapos.core-0.28.5.orig/slapos/grid/svcbackend.py	2012-08-22 03:36:10.000000000 +0900
++++ slapos.core-0.28.5/slapos/grid/svcbackend.py	2012-09-07 18:52:52.480544479 +0900
+@@ -126,6 +126,8 @@
  Typical usage:
   * %prog CONFIGURATION_FILE [arguments passed to supervisor]
  
@@ -92,7 +88,7 @@
  """.strip()
  
    parser = OptionParser(usage=usage)
-@@ -134,13 +136,13 @@
+@@ -136,13 +138,13 @@
    else:
      (argument_option_instance, argument_list) = \
        parser.parse_args(list(argument_tuple))
@@ -113,7 +109,7 @@
    slapgrid_configuration = ConfigParser.SafeConfigParser()
    slapgrid_configuration.read(configuration_file)
    # Merges the two dictionnaries
-@@ -153,7 +155,7 @@
+@@ -155,7 +157,7 @@
    if not option_dict.get('supervisord_socket'):
      option_dict['supervisord_socket'] = \
        os.path.join(option_dict['instance_root'], 'supervisord.socket')
@@ -122,11 +118,11 @@
  
  
  def supervisorctl(*argument_tuple):
-Index: slapos.core-0.25/slapos/console.py
+Index: slapos.core-0.28.5/slapos/console.py
 ===================================================================
---- slapos.core-0.25.orig/slapos/console.py	2012-04-04 00:55:17.000000000 +0900
-+++ slapos.core-0.25/slapos/console.py	2012-05-18 18:22:44.886065063 +0900
-@@ -60,10 +60,8 @@
+--- slapos.core-0.28.5.orig/slapos/console.py	2012-08-22 03:36:10.000000000 +0900
++++ slapos.core-0.28.5/slapos/console.py	2012-09-07 18:52:52.480544479 +0900
+@@ -62,10 +62,8 @@
      Check arguments
      """
      (options, args) = self.parse_args()
@@ -139,7 +135,7 @@
  
      return options, args
  
-@@ -150,7 +148,11 @@
+@@ -152,7 +150,11 @@
    """Ran when invoking slapos-request"""
    # Parse arguments
    usage = """usage: %s [options] CONFIGURATION_FILE SOFTWARE_INSTANCE INSTANCE_REFERENCE
@@ -152,7 +148,7 @@
    config = Config()
    options, arguments = RequestParser(usage=usage).check_args()
    config.setConfig(options, arguments[0])
-@@ -185,6 +187,9 @@
+@@ -187,6 +189,9 @@
  slapconsole allows you interact with slap API. You can play with the global
  "slap" object and with the global "request" method.

More information about the Python-apps-commits mailing list