[Python-apps-commits] r11792 - in packages/slapos.core/trunk/debian (7 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Tue Mar 10 07:47:36 UTC 2015
Date: Tuesday, March 10, 2015 @ 07:47:33
Author: arnau
Revision: 11792
New SlapOS upstream release.
Modified:
packages/slapos.core/trunk/debian/changelog
packages/slapos.core/trunk/debian/control
packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch
packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch
packages/slapos.core/trunk/debian/slapos-client.install
packages/slapos.core/trunk/debian/slapos-node-unofficial.install
packages/slapos.core/trunk/debian/watch
Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog 2015-03-09 21:28:17 UTC (rev 11791)
+++ packages/slapos.core/trunk/debian/changelog 2015-03-10 07:47:33 UTC (rev 11792)
@@ -1,3 +1,15 @@
+slapos.core (1.3.8-1) experimental; urgency=medium
+
+ * New upstream release.
+ + debian/control:
+ - Add python-requests and python-uritemplate to slapos-client Depends.
+ * debian/*.install: Add new files.
+ * debian/watch:
+ + Use pypi.debian.net as pypi.python.org does not allow directory
+ listing anymore.
+
+ -- Arnaud Fontaine <arnau at debian.org> Tue, 03 Mar 2015 12:01:25 +0900
+
slapos.core (1.2.4.1-2) unstable; urgency=medium
* d/control: Depends on python-psutil >= 2.0.0 due to API change leading
Modified: packages/slapos.core/trunk/debian/control
===================================================================
--- packages/slapos.core/trunk/debian/control 2015-03-09 21:28:17 UTC (rev 11791)
+++ packages/slapos.core/trunk/debian/control 2015-03-10 07:47:33 UTC (rev 11792)
@@ -22,7 +22,9 @@
${python:Depends},
python-xmlmarshaller (>= 0.9.3~),
python-cliff,
- ucf
+ ucf,
+ python-uritemplate,
+ python-requests (>= 2.4.3)
Recommends: ipython | bpython
# For tests
Suggests: pyflakes
Modified: packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch 2015-03-09 21:28:17 UTC (rev 11791)
+++ packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch 2015-03-10 07:47:33 UTC (rev 11792)
@@ -4,12 +4,38 @@
--- a/slapos/grid/slapgrid.py
+++ b/slapos/grid/slapgrid.py
-@@ -71,7 +71,7 @@
- PROMISE_TIMEOUT = 3
+@@ -76,7 +76,7 @@
+ COMPUTER_PARTITION_LATEST_BANG_TIMESTAMP_FILENAME = '.slapos_latest_bang_timestamp'
# XXX hardcoded watchdog_path
-WATCHDOG_PATH = '/opt/slapos/bin/slapos-watchdog'
+WATCHDOG_PATH = '/usr/sbin/slapos-watchdog'
- COMPUTER_PARTITION_TIMESTAMP_FILENAME = '.timestamp'
- COMPUTER_PARTITION_LATEST_BANG_TIMESTAMP_FILENAME = '.slapos_latest_bang_timestamp'
+
+ class _formatXMLError(Exception):
+--- a/slapos/cli/slapgrid.py
++++ b/slapos/cli/slapgrid.py
+@@ -121,7 +121,7 @@
+ """run software installation/deletion"""
+
+ method_name = 'processSoftwareReleaseList'
+- default_pidfile = '/opt/slapos/slapgrid-sr.pid'
++ default_pidfile = '/var/run/slapos-node-software.pid'
+
+ def get_parser(self, prog_name):
+ ap = super(SoftwareCommand, self).get_parser(prog_name)
+@@ -140,7 +140,7 @@
+ """run instance deployment"""
+
+ method_name = 'processComputerPartitionList'
+- default_pidfile = '/opt/slapos/slapgrid-cp.pid'
++ default_pidfile = '/var/run/slapos-node-instance.pid'
+
+ def get_parser(self, prog_name):
+ ap = super(InstanceCommand, self).get_parser(prog_name)
+@@ -159,4 +159,4 @@
+ """run instance reports and garbage collection"""
+
+ method_name = 'agregateAndSendUsage'
+- default_pidfile = '/opt/slapos/slapgrid-ur.pid'
++ default_pidfile = '/var/run/slapos-node-report.pid'
Modified: packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch 2015-03-09 21:28:17 UTC (rev 11791)
+++ packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch 2015-03-10 07:47:33 UTC (rev 11792)
@@ -6,7 +6,7 @@
--- a/slapos/cli/entry.py
+++ b/slapos/cli/entry.py
-@@ -69,7 +69,15 @@
+@@ -71,7 +71,15 @@
name = '%s %s' % (name, next_val) if name else next_val
if name in self.commands:
cmd_ep = self.commands[name]
@@ -23,7 +23,7 @@
return (cmd_factory, name, search_args)
else:
LOG.critical('slapos: the command %r does not exist or is not yet implemented.\n'
-@@ -95,8 +103,15 @@
+@@ -97,8 +105,15 @@
command_manager = app.command_manager
groups = collections.defaultdict(list)
for name, ep in sorted(command_manager):
@@ -41,7 +41,7 @@
for group in sorted(groups):
app.stdout.write('\n%s commands:\n' % group)
-@@ -104,20 +119,6 @@
+@@ -106,20 +121,6 @@
app.stdout.write(line)
sys.exit(0)
Modified: packages/slapos.core/trunk/debian/slapos-client.install
===================================================================
--- packages/slapos.core/trunk/debian/slapos-client.install 2015-03-09 21:28:17 UTC (rev 11791)
+++ packages/slapos.core/trunk/debian/slapos-client.install 2015-03-10 07:47:33 UTC (rev 11792)
@@ -8,6 +8,7 @@
usr/lib/python2.*/dist-packages/slapos/cli/remove.py
usr/lib/python2.*/dist-packages/slapos/cli/supply.py
usr/lib/python2.*/dist-packages/slapos/cli/request.py
+usr/lib/python2.*/dist-packages/slapos/cli/coloredlogs/
usr/lib/python2.*/dist-packages/slapos/client.py
usr/lib/python2.*/dist-packages/slapos/version.py
usr/lib/python2.*/dist-packages/slapos/slapos.xsd
Modified: packages/slapos.core/trunk/debian/slapos-node-unofficial.install
===================================================================
--- packages/slapos.core/trunk/debian/slapos-node-unofficial.install 2015-03-09 21:28:17 UTC (rev 11791)
+++ packages/slapos.core/trunk/debian/slapos-node-unofficial.install 2015-03-10 07:47:33 UTC (rev 11792)
@@ -15,7 +15,10 @@
usr/lib/python2.*/dist-packages/slapos/cli/cache.py
usr/lib/python2.*/dist-packages/slapos/cli/register.py
usr/lib/python2.*/dist-packages/slapos/cli/boot.py
+usr/lib/python2.*/dist-packages/slapos/cli/info.py
+usr/lib/python2.*/dist-packages/slapos/cli/list.py
usr/lib/python2.*/dist-packages/slapos/util.py
+usr/lib/python2.*/dist-packages/slapos/human.py
usr/lib/python2.*/dist-packages/slapos/tests/cli.py
usr/lib/python2.*/dist-packages/slapos/tests/collect.py
usr/lib/python2.*/dist-packages/slapos/tests/slapproxy/
Modified: packages/slapos.core/trunk/debian/watch
===================================================================
--- packages/slapos.core/trunk/debian/watch 2015-03-09 21:28:17 UTC (rev 11791)
+++ packages/slapos.core/trunk/debian/watch 2015-03-10 07:47:33 UTC (rev 11792)
@@ -1,3 +1,3 @@
version=3
opts="dversionmangle=s/\+.*//" \
- http://pypi.python.org/packages/source/s/slapos.core/slapos.core-([\d.]*)\.tar\.gz
+ http://pypi.debian.net/slapos.core/slapos.core-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
More information about the Python-apps-commits
mailing list