[Python-apps-commits] r9165 - in packages/slapos.core/trunk/debian/patches (1 file)

[arnau at users.alioth.debian.org]

    Date: Wednesday, October 3, 2012 @ 03:35:54
  Author: arnau
Revision: 9165

Refresh Debian patches following NUR.

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

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-10-03 03:13:53 UTC (rev 9164)
+++ packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch	2012-10-03 03:35:54 UTC (rev 9165)
@@ -6,10 +6,10 @@
  on /etc/slapos/slapos-client.cfg and /etc/slapos/slapos-node-unofficial.cfg
  generated upon package installation.
 
-Index: slapos.core-0.28.5/slapos/format.py
+Index: slapos.core-0.31.2/slapos/format.py
 ===================================================================
---- 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
+--- slapos.core-0.31.2.orig/slapos/format.py	2012-09-27 20:03:22.000000000 +0900
++++ slapos.core-0.31.2/slapos/format.py	2012-10-03 12:27:00.929310581 +0900
 @@ -885,8 +885,10 @@
      else:
        (options, args) = self.parse_args()
@@ -36,19 +36,19 @@
  
    # Parse arguments
    options, configuration_file_path = Parser(usage=usage).check_args(args)
-Index: slapos.core-0.28.5/slapos/grid/slapgrid.py
+Index: slapos.core-0.31.2/slapos/grid/slapgrid.py
 ===================================================================
---- 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 @@
+--- slapos.core-0.31.2.orig/slapos/grid/slapgrid.py	2012-10-02 18:47:21.000000000 +0900
++++ slapos.core-0.31.2/slapos/grid/slapgrid.py	2012-10-03 12:27:00.929310581 +0900
+@@ -113,6 +113,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("--now", action="store_true", default=False,
-       help="Launch slapgrid without delay.")
-@@ -135,7 +136,7 @@
+   parser.add_argument("--maximal_delay", help="The maximal delay value in seconds. " \
+                     "A negative value leads start immediately.")
+@@ -142,7 +143,7 @@
        parser.parse_args(list(argument_tuple))
    # Parses arguments from config file, if needed, then merge previous arguments
    option_dict = {}
@@ -57,10 +57,10 @@
    # Loads config (if config specified)
    slapgrid_configuration = ConfigParser.SafeConfigParser()
    slapgrid_configuration.readfp(configuration_file)
-Index: slapos.core-0.28.5/slapos/proxy/__init__.py
+Index: slapos.core-0.31.2/slapos/proxy/__init__.py
 ===================================================================
---- 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
+--- slapos.core-0.31.2.orig/slapos/proxy/__init__.py	2012-09-25 21:55:43.000000000 +0900
++++ slapos.core-0.31.2/slapos/proxy/__init__.py	2012-10-03 12:27:00.929310581 +0900
 @@ -67,9 +67,11 @@
      """
      (options, args) = self.parse_args()
@@ -75,10 +75,10 @@
  
  class Config:
    def setConfig(self, option_dict, configuration_file_path):
-Index: slapos.core-0.28.5/slapos/grid/svcbackend.py
+Index: slapos.core-0.31.2/slapos/grid/svcbackend.py
 ===================================================================
---- 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
+--- slapos.core-0.31.2.orig/slapos/grid/svcbackend.py	2012-09-25 21:55:43.000000000 +0900
++++ slapos.core-0.31.2/slapos/grid/svcbackend.py	2012-10-03 12:27:00.933310593 +0900
 @@ -126,6 +126,8 @@
  Typical usage:
   * %prog CONFIGURATION_FILE [arguments passed to supervisor]
@@ -118,10 +118,10 @@
  
  
  def supervisorctl(*argument_tuple):
-Index: slapos.core-0.28.5/slapos/console.py
+Index: slapos.core-0.31.2/slapos/console.py
 ===================================================================
---- 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
+--- slapos.core-0.31.2.orig/slapos/console.py	2012-09-25 21:55:43.000000000 +0900
++++ slapos.core-0.31.2/slapos/console.py	2012-10-03 12:27:00.933310593 +0900
 @@ -62,10 +62,8 @@
      Check arguments
      """