[Python-apps-commits] r9464 - in packages/slapos.core/trunk/debian (6 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Fri Mar 1 07:23:01 UTC 2013
Date: Friday, March 1, 2013 @ 07:22:59
Author: arnau
Revision: 9464
New upstream release.
Modified:
packages/slapos.core/trunk/debian/changelog
packages/slapos.core/trunk/debian/patches/do_not_use_debian_zc.buildout.patch
packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch
packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch
packages/slapos.core/trunk/debian/slapos-client.install
packages/slapos.core/trunk/debian/slapos-node-unofficial.install
Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog 2013-03-01 03:15:43 UTC (rev 9463)
+++ packages/slapos.core/trunk/debian/changelog 2013-03-01 07:22:59 UTC (rev 9464)
@@ -1,3 +1,12 @@
+slapos.core (0.35.1-1) unstable; urgency=low
+
+ * New upstream release.
+ + Refresh debian/patches/*.
+ + debian/slapos-client.install: add new files.
+ + debian/slapos-node-unofficial.install: new slapproxy-query command.
+
+ -- Arnaud Fontaine <arnau at debian.org> Thu, 28 Feb 2013 19:25:16 +0900
+
slapos.core (0.34-1) unstable; urgency=low
* New upstream release.
Modified: packages/slapos.core/trunk/debian/patches/do_not_use_debian_zc.buildout.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/do_not_use_debian_zc.buildout.patch 2013-03-01 03:15:43 UTC (rev 9463)
+++ packages/slapos.core/trunk/debian/patches/do_not_use_debian_zc.buildout.patch 2013-03-01 07:22:59 UTC (rev 9464)
@@ -1,12 +1,12 @@
-Index: slapos.core-0.34/setup.py
+Index: slapos.core-0.35.1/setup.py
===================================================================
---- slapos.core-0.34.orig/setup.py 2013-02-06 16:37:20.351847494 +0900
-+++ slapos.core-0.34/setup.py 2013-02-06 16:37:20.347847451 +0900
-@@ -43,7 +43,6 @@
- 'xml_marshaller>=0.9.3', # to unmarshall/marshall python objects to/from
- # XML
- 'zope.interface', # slap library implementes interfaces
-- 'zc.buildout',
+--- slapos.core-0.35.1.orig/setup.py 2013-02-28 19:39:50.728890913 +0900
++++ slapos.core-0.35.1/setup.py 2013-02-28 19:40:07.645065734 +0900
+@@ -45,7 +45,6 @@
+ 'xml_marshaller>=0.9.3', # to unmarshall/marshall python objects to/from
+ # XML
+ 'zope.interface', # slap library implementes interfaces
+- 'zc.buildout',
] + additional_install_requires,
zip_safe=False, # proxy depends on Flask, which has issues with
# accessing templates
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-01 03:15:43 UTC (rev 9463)
+++ packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch 2013-03-01 07:22:59 UTC (rev 9464)
@@ -4,11 +4,11 @@
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.34/slapos/entry.py
+Index: slapos.core-0.35.1/slapos/entry.py
===================================================================
---- slapos.core-0.34.orig/slapos/entry.py 2013-02-07 10:42:46.645209016 +0900
-+++ slapos.core-0.34/slapos/entry.py 2013-02-07 10:42:46.641208978 +0900
-@@ -30,19 +30,25 @@
+--- 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
+@@ -30,19 +30,26 @@
import ConfigParser
import os
import sys
@@ -39,10 +39,11 @@
+ SLAPOS_CLIENT_ONLY = True
+else:
+ SLAPOS_CLIENT_ONLY = False
++
+ from slapos.version import version
# Note: this whole file is a hack. We should better try dedicated library
- # like https://github.com/dhellmann/cliff or https://github.com/docopt/docopt.
-@@ -168,7 +174,7 @@
+@@ -170,7 +177,7 @@
module responsible of the operation.
"""
# If "node" arg is the first: we strip it and set a switch
@@ -51,18 +52,18 @@
sys.argv.pop(1)
# Hackish way to show status if no argument is specified
if len(sys.argv) is 1:
-@@ -179,12 +185,24 @@
+@@ -181,12 +188,24 @@
- usage = """SlapOS command line interface.
+ usage = """SlapOS %s command line interface.
For more informations, refer to SlapOS documentation.
+"""
-+
+
+ if SLAPOS_CLIENT_ONLY:
+ usage += """
+*****IMPORTANT NOTE*****: "node" subcommands are not available because
+"slapos-node-unofficial" Debian package is not installed.
+"""
-
++
+ usage += """
Client subcommands usage:
slapos request <instance-name> <software-url> [--configuration arg1=value1 arg2=value2 ... argN=valueN]
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 2013-03-01 03:15:43 UTC (rev 9463)
+++ packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch 2013-03-01 07:22:59 UTC (rev 9464)
@@ -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.34/slapos/format.py
+Index: slapos.core-0.35.1/slapos/format.py
===================================================================
---- slapos.core-0.34.orig/slapos/format.py 2013-02-07 10:48:24.688511393 +0900
-+++ slapos.core-0.34/slapos/format.py 2013-02-07 10:48:24.680511311 +0900
-@@ -884,8 +884,10 @@
+--- slapos.core-0.35.1.orig/slapos/format.py 2013-02-28 19:46:01.532762494 +0900
++++ slapos.core-0.35.1/slapos/format.py 2013-02-28 19:46:01.524762410 +0900
+@@ -960,8 +960,10 @@
else:
(options, args) = self.parse_args()
if len(args) != 1:
@@ -21,25 +21,25 @@
+ configuration_file = args[0]
+ return options, configuration_file
- def run(config):
- # Define the computer
-@@ -1192,7 +1194,11 @@
- global os
- global callAndRead
- real_callAndRead = callAndRead
+
+
+@@ -1326,7 +1328,11 @@
+ "Run default configuration."
+
+ # Parse arguments
- usage = "usage: %s [options] CONFIGURATION_FILE" % sys.argv[0]
+ usage = """usage: %s [options] CONFIGURATION_FILE
+
+If CONFIGURATION_FILE is not given explicitly, it fallbacks on
+`/etc/slapos/slapos-node-unofficial.cfg'.
+""" % sys.argv[0]
-
- # Parse arguments
options, configuration_file_path = Parser(usage=usage).check_args(args)
-Index: slapos.core-0.34/slapos/grid/slapgrid.py
+ config = Config()
+ try:
+Index: slapos.core-0.35.1/slapos/grid/slapgrid.py
===================================================================
---- slapos.core-0.34.orig/slapos/grid/slapgrid.py 2013-02-07 10:48:24.688511393 +0900
-+++ slapos.core-0.34/slapos/grid/slapgrid.py 2013-02-07 10:48:24.684511353 +0900
+--- slapos.core-0.35.1.orig/slapos/grid/slapgrid.py 2013-02-28 19:46:01.532762494 +0900
++++ slapos.core-0.35.1/slapos/grid/slapgrid.py 2013-02-28 19:46:01.528762453 +0900
@@ -145,8 +145,9 @@
"(ie.:slappartX, slappartY),"
"this option will make all others computer partitions be ignored.")
@@ -61,10 +61,10 @@
# Loads config (if config specified)
slapgrid_configuration = ConfigParser.SafeConfigParser()
slapgrid_configuration.readfp(configuration_file)
-Index: slapos.core-0.34/slapos/proxy/__init__.py
+Index: slapos.core-0.35.1/slapos/proxy/__init__.py
===================================================================
---- slapos.core-0.34.orig/slapos/proxy/__init__.py 2013-02-07 10:48:24.688511393 +0900
-+++ slapos.core-0.34/slapos/proxy/__init__.py 2013-02-07 10:48:24.684511353 +0900
+--- slapos.core-0.35.1.orig/slapos/proxy/__init__.py 2013-02-28 19:46:01.532762494 +0900
++++ slapos.core-0.35.1/slapos/proxy/__init__.py 2013-02-28 19:46:01.528762453 +0900
@@ -67,9 +67,11 @@
"""
(options, args) = self.parse_args()
@@ -79,10 +79,10 @@
class Config:
def setConfig(self, option_dict, configuration_file_path):
-Index: slapos.core-0.34/slapos/grid/svcbackend.py
+Index: slapos.core-0.35.1/slapos/grid/svcbackend.py
===================================================================
---- slapos.core-0.34.orig/slapos/grid/svcbackend.py 2013-02-07 10:48:24.688511393 +0900
-+++ slapos.core-0.34/slapos/grid/svcbackend.py 2013-02-07 10:48:24.684511353 +0900
+--- slapos.core-0.35.1.orig/slapos/grid/svcbackend.py 2013-02-28 19:46:01.532762494 +0900
++++ slapos.core-0.35.1/slapos/grid/svcbackend.py 2013-02-28 19:46:01.528762453 +0900
@@ -127,6 +127,8 @@
Typical usage:
* %prog CONFIGURATION_FILE [arguments passed to supervisor]
@@ -120,10 +120,10 @@
def supervisorctl(*argument_tuple):
-Index: slapos.core-0.34/slapos/bang.py
+Index: slapos.core-0.35.1/slapos/bang.py
===================================================================
---- slapos.core-0.34.orig/slapos/bang.py 2013-02-07 10:48:24.688511393 +0900
-+++ slapos.core-0.34/slapos/bang.py 2013-02-07 10:48:24.684511353 +0900
+--- slapos.core-0.35.1.orig/slapos/bang.py 2013-02-28 19:46:01.532762494 +0900
++++ slapos.core-0.35.1/slapos/bang.py 2013-02-28 19:46:01.528762453 +0900
@@ -34,13 +34,14 @@
def main(*args):
parser = argparse.ArgumentParser()
@@ -141,10 +141,10 @@
message = argument.message
# Loads config (if config specified)
configuration = ConfigParser.SafeConfigParser()
-Index: slapos.core-0.34/slapos/client.py
+Index: slapos.core-0.35.1/slapos/client.py
===================================================================
---- slapos.core-0.34.orig/slapos/client.py 2013-02-07 10:48:24.688511393 +0900
-+++ slapos.core-0.34/slapos/client.py 2013-02-07 10:48:24.684511353 +0900
+--- slapos.core-0.35.1.orig/slapos/client.py 2013-02-28 19:46:01.532762494 +0900
++++ slapos.core-0.35.1/slapos/client.py 2013-02-28 19:46:01.528762453 +0900
@@ -64,12 +64,15 @@
"""
(options, args) = self.parse_args()
@@ -226,11 +226,11 @@
examples :
>>> # Request instance
>>> request(kvm, "myuniquekvm")
-Index: slapos.core-0.34/slapos/entry.py
+Index: slapos.core-0.35.1/slapos/entry.py
===================================================================
---- slapos.core-0.34.orig/slapos/entry.py 2013-02-07 10:48:24.688511393 +0900
-+++ slapos.core-0.34/slapos/entry.py 2013-02-07 10:48:24.684511353 +0900
-@@ -49,11 +49,15 @@
+--- slapos.core-0.35.1.orig/slapos/entry.py 2013-02-28 19:46:01.532762494 +0900
++++ slapos.core-0.35.1/slapos/entry.py 2013-02-28 19:46:01.528762453 +0900
+@@ -50,11 +50,15 @@
GLOBAL_SLAPOS_CONFIGURATION = os.environ.get(
'SLAPOS_CONFIGURATION',
@@ -247,10 +247,10 @@
class EntryPointNotImplementedError(NotImplementedError):
def __init__(self, *args, **kw_args):
NotImplementedError.__init__(self, *args, **kw_args)
-Index: slapos.core-0.34/slapos/cache.py
+Index: slapos.core-0.35.1/slapos/cache.py
===================================================================
---- slapos.core-0.34.orig/slapos/cache.py 2013-02-07 10:48:24.688511393 +0900
-+++ slapos.core-0.34/slapos/cache.py 2013-02-07 10:49:08.560952011 +0900
+--- slapos.core-0.35.1.orig/slapos/cache.py 2013-02-28 19:46:01.532762494 +0900
++++ slapos.core-0.35.1/slapos/cache.py 2013-02-28 19:46:01.528762453 +0900
@@ -18,7 +18,10 @@
def cache_lookup():
@@ -263,3 +263,32 @@
parser.add_argument("software_url", help="Your software url or MD5 hash")
args = parser.parse_args()
+Index: slapos.core-0.35.1/slapos/proxy/query.py
+===================================================================
+--- slapos.core-0.35.1.orig/slapos/proxy/query.py 2013-02-08 18:25:46.000000000 +0900
++++ slapos.core-0.35.1/slapos/proxy/query.py 2013-02-28 19:50:59.527916050 +0900
+@@ -50,8 +50,9 @@
+ Check arguments
+ """
+ (options, args) = self.parse_args()
+- if len(args) < 1:
+- self.error("Incorrect number of arguments")
++ args_len = len(args)
++ if args_len < 1:
++ return options, '/etc/slapos/slapos-node-unofficial.cfg'
+
+ return options, args[0]
+
+@@ -228,7 +229,11 @@
+
+ def main():
+ "Run default configuration."
+- usage = "usage: %s [options] CONFIGURATION_FILE" % sys.argv[0]
++ usage = """usage: %s [options] CONFIGURATION_FILE
++
++If CONFIGURATION_FILE is not given explicitly, it fallbacks on
++`/etc/slapos/slapos-node-unofficial.cfg'.
++""" % sys.argv[0]
+
+ try:
+ # Parse arguments
Modified: packages/slapos.core/trunk/debian/slapos-client.install
===================================================================
--- packages/slapos.core/trunk/debian/slapos-client.install 2013-03-01 03:15:43 UTC (rev 9463)
+++ packages/slapos.core/trunk/debian/slapos-client.install 2013-03-01 07:22:59 UTC (rev 9464)
@@ -1,6 +1,8 @@
usr/lib/python2.*/dist-packages/slapos.core*.egg-info/
usr/lib/python2.*/dist-packages/slapos/entry.py
usr/lib/python2.*/dist-packages/slapos/client.py
+usr/lib/python2.*/dist-packages/slapos/util.py
+usr/lib/python2.*/dist-packages/slapos/version.py
usr/lib/python2.*/dist-packages/slapos/cache.py
usr/lib/python2.*/dist-packages/slapos/slapos.xsd
usr/lib/python2.*/dist-packages/slapos/slap/
Modified: packages/slapos.core/trunk/debian/slapos-node-unofficial.install
===================================================================
--- packages/slapos.core/trunk/debian/slapos-node-unofficial.install 2013-03-01 03:15:43 UTC (rev 9463)
+++ packages/slapos.core/trunk/debian/slapos-node-unofficial.install 2013-03-01 07:22:59 UTC (rev 9464)
@@ -15,6 +15,7 @@
usr/bin/slapgrid-supervisorctl usr/sbin
usr/bin/slapgrid-supervisord usr/sbin
usr/bin/slapproxy usr/sbin
+usr/bin/slapproxy-query usr/bin
usr/bin/slapgrid-sr usr/sbin
usr/bin/bang usr/sbin
usr/bin/slapgrid usr/sbin
More information about the Python-apps-commits
mailing list