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

[arnau at users.alioth.debian.org]

    Date: Friday, July 8, 2011 @ 16:02:48
  Author: arnau
Revision: 7280

* New upstream snapshot.
* debian/patches/system_configuration_file_by_default.patch:
  + Patch slapconsole and slapos-request as well as it now parsed
    /etc/slapos/slapos.cfg.

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	2011-07-04 19:03:31 UTC (rev 7279)
+++ packages/slapos.core/trunk/debian/changelog	2011-07-08 16:02:48 UTC (rev 7280)
@@ -1,3 +1,12 @@
+slapos.core (0.8+20110708+1.git5c55e0e-1) unstable; urgency=low
+
+  * New upstream snapshot.
+  * debian/patches/system_configuration_file_by_default.patch:
+    + Patch slapconsole and slapos-request as well as it now parsed
+      /etc/slapos/slapos.cfg.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Fri, 08 Jul 2011 13:44:25 +0200
+
 slapos.core (0.8+20110701+1.gitc5b5897-1) unstable; urgency=low
 
   * New upstream snapshot.

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-07-04 19:03:31 UTC (rev 7279)
+++ packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch	2011-07-08 16:02:48 UTC (rev 7280)
@@ -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.8/slapos/format/__init__.py
+Index: slapos.core-0.8+20110708+1.git5c55e0e/slapos/format.py
 ===================================================================
---- 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 @@
+--- slapos.core-0.8+20110708+1.git5c55e0e.orig/slapos/format.py	2011-07-08 16:00:40.000000000 +0200
++++ slapos.core-0.8+20110708+1.git5c55e0e/slapos/format.py	2011-07-08 16:04:06.293661230 +0200
+@@ -830,8 +830,10 @@
      """
      (options, args) = self.parse_args()
      if len(args) != 1:
@@ -22,7 +22,7 @@
  
  def run(config):
    try:
-@@ -988,7 +990,11 @@
+@@ -1072,7 +1074,11 @@
    global callAndRead
    global getpwnam
    real_callAndRead = callAndRead
@@ -35,10 +35,10 @@
  
    try:
      # Parse arguments
-Index: slapos.core-0.8/slapos/grid/slapgrid.py
+Index: slapos.core-0.8+20110708+1.git5c55e0e/slapos/grid/slapgrid.py
 ===================================================================
---- 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
+--- slapos.core-0.8+20110708+1.git5c55e0e.orig/slapos/grid/slapgrid.py	2011-07-08 16:00:40.000000000 +0200
++++ slapos.core-0.8+20110708+1.git5c55e0e/slapos/grid/slapgrid.py	2011-07-08 16:04:06.293661230 +0200
 @@ -105,8 +105,8 @@
        help="Enables console output and live output from subcommands.")
    parser.add_argument("-v", "--verbose", action="store_true", default=False,
@@ -59,10 +59,10 @@
    # Loads config (if config specified)
    slapgrid_configuration = ConfigParser.SafeConfigParser()
    slapgrid_configuration.readfp(configuration_file)
-Index: slapos.core-0.8/slapos/proxy/__init__.py
+Index: slapos.core-0.8+20110708+1.git5c55e0e/slapos/proxy/__init__.py
 ===================================================================
---- 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
+--- slapos.core-0.8+20110708+1.git5c55e0e.orig/slapos/proxy/__init__.py	2011-07-08 16:00:40.000000000 +0200
++++ slapos.core-0.8+20110708+1.git5c55e0e/slapos/proxy/__init__.py	2011-07-08 16:04:06.293661230 +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.8/slapos/grid/svcbackend.py
+Index: slapos.core-0.8+20110708+1.git5c55e0e/slapos/grid/svcbackend.py
 ===================================================================
---- 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
+--- slapos.core-0.8+20110708+1.git5c55e0e.orig/slapos/grid/svcbackend.py	2011-07-08 16:00:40.000000000 +0200
++++ slapos.core-0.8+20110708+1.git5c55e0e/slapos/grid/svcbackend.py	2011-07-08 16:04:06.293661230 +0200
 @@ -124,6 +124,8 @@
  Typical usage:
   * %prog CONFIGURATION_FILE [arguments passed to supervisor]
@@ -120,3 +120,43 @@
  
  
  def supervisorctl(*argument_tuple):
+Index: slapos.core-0.8+20110708+1.git5c55e0e/slapos/console.py
+===================================================================
+--- slapos.core-0.8+20110708+1.git5c55e0e.orig/slapos/console.py	2011-07-08 16:04:08.077661232 +0200
++++ slapos.core-0.8+20110708+1.git5c55e0e/slapos/console.py	2011-07-08 17:57:10.433662228 +0200
+@@ -60,10 +60,8 @@
+     Check arguments
+     """
+     (options, args) = self.parse_args()
+-    if len(args) == 0:
+-      self.error("Incorrect number of arguments")
+-    elif not os.path.isfile(args[0]):
+-      self.error("%s: Not found or not a regular file." % args[0])
++    if len(args) == 0 or not os.path.isfile(args[0]):
++      args.insert(0, '/etc/slapos/slapos.cfg')
+ 
+     return options, args
+ 
+@@ -141,7 +139,11 @@
+   """Ran when invoking slapos-request"""
+   # Parse arguments
+   usage = """usage: %s [options] CONFIGURATION_FILE SOFTWARE_INSTANCE INSTANCE_REFERENCE
+-slapos-request allows you to request slapos instances.""" % sys.argv[0]
++slapos-request allows you to request slapos instances.
++
++If CONFIGURATION_FILE is not given explicitly, then `/etc/slapos/slapos.cfg'
++will be used.
++""" % sys.argv[0]
+   config = Config()
+   options, arguments = RequestParser(usage=usage).check_args()
+   config.setConfig(options, arguments[0])
+@@ -176,6 +178,9 @@
+ slapconsole allows you interact with slap API. You can play with the global
+ "slap" object and with the global "request" method.
+ 
++If CONFIGURATION_FILE is not given explicitly, then `/etc/slapos/slapos.cfg'
++will be used.
++
+ examples :
+   >>> # Request instance
+   >>> request(kvm, "myuniquekvm")