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

[arnau at users.alioth.debian.org]

    Date: Wednesday, June 29, 2011 @ 12:37:13
  Author: arnau
Revision: 7246

Refresh debian/patches/system_configuration_file_by_default.patch following release of 0.8.

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	2011-06-29 12:37:09 UTC (rev 7245)
+++ packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch	2011-06-29 12:37:13 UTC (rev 7246)
@@ -5,11 +5,11 @@
  the configuration file options are set up through debconf, fallback
  on /etc/slapos/slapos.cfg generated upon package installation.
 
-Index: slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937/slapos/format/__init__.py
+Index: slapos.core-0.8/slapos/format/__init__.py
 ===================================================================
---- slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937.orig/slapos/format/__init__.py	2011-06-09 00:39:16.000000000 +0900
-+++ slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937/slapos/format/__init__.py	2011-06-18 15:59:22.068004898 +0900
-@@ -715,8 +715,10 @@
+--- slapos.core-0.8.orig/slapos/format/__init__.py	2011-06-22 10:27:18.000000000 +0200
++++ slapos.core-0.8/slapos/format/__init__.py	2011-06-29 14:29:38.777910440 +0200
+@@ -746,8 +746,10 @@
      """
      (options, args) = self.parse_args()
      if len(args) != 1:
@@ -22,10 +22,10 @@
  
  def run(config):
    try:
-@@ -944,7 +946,11 @@
- 
- def main():
-   "Run default configuration."
+@@ -988,7 +990,11 @@
+   global callAndRead
+   global getpwnam
+   real_callAndRead = callAndRead
 -  usage = "usage: %s [options] CONFIGURATION_FILE" % sys.argv[0]
 +  usage = """usage: %s [options] CONFIGURATION_FILE
 +
@@ -35,11 +35,11 @@
  
    try:
      # Parse arguments
-Index: slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937/slapos/grid/slapgrid.py
+Index: slapos.core-0.8/slapos/grid/slapgrid.py
 ===================================================================
---- slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937.orig/slapos/grid/slapgrid.py	2011-06-09 00:39:16.000000000 +0900
-+++ slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937/slapos/grid/slapgrid.py	2011-06-18 15:59:22.072004898 +0900
-@@ -103,8 +103,8 @@
+--- slapos.core-0.8.orig/slapos/grid/slapgrid.py	2011-06-21 10:47:40.000000000 +0200
++++ slapos.core-0.8/slapos/grid/slapgrid.py	2011-06-29 14:24:38.861902078 +0200
+@@ -105,8 +105,8 @@
        help="Enables console output and live output from subcommands.")
    parser.add_argument("-v", "--verbose", action="store_true", default=False,
        help="Be verbose.")
@@ -50,7 +50,7 @@
  
    # Parses arguments
    if argument_tuple == ():
-@@ -115,7 +115,7 @@
+@@ -117,7 +117,7 @@
        parser.parse_args(list(argument_tuple))
    # Parses arguments from config file, if needed, then merge previous arguments
    option_dict = {}
@@ -59,10 +59,10 @@
    # Loads config (if config specified)
    slapgrid_configuration = ConfigParser.SafeConfigParser()
    slapgrid_configuration.readfp(configuration_file)
-Index: slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937/slapos/proxy/__init__.py
+Index: slapos.core-0.8/slapos/proxy/__init__.py
 ===================================================================
---- slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937.orig/slapos/proxy/__init__.py	2011-06-18 16:09:38.604004909 +0900
-+++ slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937/slapos/proxy/__init__.py	2011-06-18 16:10:22.708004911 +0900
+--- slapos.core-0.8.orig/slapos/proxy/__init__.py	2011-05-30 11:06:34.000000000 +0200
++++ slapos.core-0.8/slapos/proxy/__init__.py	2011-06-29 14:24:38.861902078 +0200
 @@ -38,9 +38,11 @@
      """
      (options, args) = self.parse_args()
@@ -77,10 +77,10 @@
  
  class Config:
    def setConfig(self, option_dict, configuration_file_path):
-Index: slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937/slapos/grid/svcbackend.py
+Index: slapos.core-0.8/slapos/grid/svcbackend.py
 ===================================================================
---- slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937.orig/slapos/grid/svcbackend.py	2011-06-18 16:11:55.392004911 +0900
-+++ slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937/slapos/grid/svcbackend.py	2011-06-18 20:40:10.696005201 +0900
+--- slapos.core-0.8.orig/slapos/grid/svcbackend.py	2011-06-08 15:45:27.000000000 +0200
++++ slapos.core-0.8/slapos/grid/svcbackend.py	2011-06-29 14:24:38.865902079 +0200
 @@ -124,6 +124,8 @@
  Typical usage:
   * %prog CONFIGURATION_FILE [arguments passed to supervisor]