Hello community, here is the log from the commit of package pssh for openSUSE:Factory checked in at 2013-09-14 19:55:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pssh (Old) and /work/SRC/openSUSE:Factory/.pssh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pssh" Changes: -------- --- /work/SRC/openSUSE:Factory/pssh/pssh.changes 2012-03-17 13:22:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pssh.new/pssh.changes 2013-09-14 19:55:42.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Sep 13 12:43:13 UTC 2013 - [email protected] + +- Update pssh_pcmk_nodes.patch: Update interface to crm_node (its + output changed) + +------------------------------------------------------------------- +Wed Sep 11 09:01:07 UTC 2013 - [email protected] + +- Add pssh_status_order.patch: Return statuses of ssh commands in + the proper order (helps in crmsh resource testing and history) + (bnc#828897) + +------------------------------------------------------------------- New: ---- pssh_status_order.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pssh.spec ++++++ --- /var/tmp/diff_new_pack.8prZ1B/_old 2013-09-14 19:55:43.000000000 +0200 +++ /var/tmp/diff_new_pack.8prZ1B/_new 2013-09-14 19:55:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pssh # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,6 @@ # - Name: pssh Version: 2.3.1 Release: 0 @@ -24,11 +23,23 @@ License: BSD-3-Clause Group: Productivity/Clustering/Computing Source: http://parallel-ssh.googlecode.com/files/pssh-%{version}.tar.gz +# PATCH-FIX-OPENSUSE pssh-remove_shebangs.patch -- remove +# shebangs from library files Patch1: pssh-remove_shebangs.patch +# PATCH-FIX-OPENSUSE pssh-man_dir.patch -- adjust man pages +# destination Patch2: pssh-man_dir.patch +# PATCH-FEATURE-UPSTREAM pssh_quiet.patch -- add the -q (quiet) +# option Patch3: pssh_quiet.patch +# PATCH-FEATURE-UPSTREAM pssh_pcmk_nodes.patch -- add +# -C/--pcmk_nodes option to get list of nodes from Pacemaker Patch4: pssh_pcmk_nodes.patch +# PATCH-FIX-OPENSUSE pssh_askpass_dir.patch -- add openSUSE +# specific pssh-askpass location Patch5: pssh_askpass_dir.patch +# PATCH-FIX-UPSTREAM pssh_status_order.patch -- bnc#828897 +Patch6: pssh_status_order.patch Url: http://code.google.com/p/parallel-ssh/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel @@ -54,8 +65,8 @@ %package -n python-pssh Summary: Python Module for Parallel SSH Group: Development/Libraries/Python -Requires: rsync Requires: openssh +Requires: rsync %py_requires %description -n python-pssh @@ -72,6 +83,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build %__python ./setup.py build ++++++ pssh_pcmk_nodes.patch ++++++ --- /var/tmp/diff_new_pack.8prZ1B/_old 2013-09-14 19:55:43.000000000 +0200 +++ /var/tmp/diff_new_pack.8prZ1B/_new 2013-09-14 19:55:43.000000000 +0200 @@ -160,7 +160,7 @@ + return hosts + for s in outp.split('\n'): + a = s.split() -+ if len(a) != 3: ++ if len(a) < 2: + continue + hosts.append((a[1], None, None)) + return hosts ++++++ pssh_status_order.patch ++++++ >From 76f5081611627ee4f815de214ad5aa9aa7966db6 Mon Sep 17 00:00:00 2001 From: Dejan Muhamedagic <[email protected]> Date: Wed, 26 Jun 2013 17:11:46 +0200 Subject: [PATCH] Fix order of command statuses returned by the Manager --- psshlib/manager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psshlib/manager.py b/psshlib/manager.py index 7dbf4e3..06e1cf3 100644 --- a/psshlib/manager.py +++ b/psshlib/manager.py @@ -6,6 +6,7 @@ import select import signal import sys import threading +import copy try: import queue @@ -43,6 +44,7 @@ class Manager(object): self.taskcount = 0 self.tasks = [] + self.save_tasks = [] self.running = [] self.done = [] @@ -50,6 +52,7 @@ class Manager(object): def run(self): """Processes tasks previously added with add_task.""" + self.save_tasks = copy.copy(self.tasks) try: if self.outdir or self.errdir: writer = Writer(self.outdir, self.errdir) @@ -88,7 +91,7 @@ class Manager(object): writer.signal_quit() writer.join() - statuses = [task.exitstatus for task in self.done] + statuses = [task.exitstatus for task in self.save_tasks if task in self.done] return statuses def clear_sigchld_handler(self): -- 1.8.3.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
