Hello community, here is the log from the commit of package pssh for openSUSE:Factory checked in at 2014-12-25 23:21:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-01-23 15:53:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pssh.new/pssh.changes 2014-12-25 23:20:48.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Dec 25 17:10:43 UTC 2014 - [email protected] + +- Add: 0001-Prepend-hostname-on-each-line-when-P-is-set.patch + - Prepend hostname on each line when -P is set (fate#318220) +- Add: 0002-Fix-quiet-option-after-API-patch.patch + - Fix quiet option after API patch + +------------------------------------------------------------------- New: ---- 0001-Prepend-hostname-on-each-line-when-P-is-set.patch 0002-Fix-quiet-option-after-API-patch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pssh.spec ++++++ --- /var/tmp/diff_new_pack.eIjSrl/_old 2014-12-25 23:20:49.000000000 +0100 +++ /var/tmp/diff_new_pack.eIjSrl/_new 2014-12-25 23:20:49.000000000 +0100 @@ -47,6 +47,10 @@ # PATCH-FEATURE-UPSTREAM 0008-openSUSE-add-C-pcmk_nodes-option-to-get-list-of-node.patch [email protected] -- add # -C/--pcmk_nodes option to get list of nodes from Pacemaker Patch8: 0008-openSUSE-add-C-pcmk_nodes-option-to-get-list-of-node.patch +# PATCH-FEATURE-UPSTREAM Prepend hostname on each line when -P is set +Patch9: 0001-Prepend-hostname-on-each-line-when-P-is-set.patch +# PATCH-FIX-UPSTREAM Fix quiet option after API patch +Patch10: 0002-Fix-quiet-option-after-API-patch.patch Url: http://code.google.com/p/parallel-ssh/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel @@ -93,6 +97,8 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 %build %__python ./setup.py build ++++++ 0001-Prepend-hostname-on-each-line-when-P-is-set.patch ++++++ >From 4d1551db70fed7e22f95b3aae5fa68ee02a82312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <[email protected]> Date: Sun, 21 Dec 2014 08:32:49 +0100 Subject: [PATCH 1/2] Prepend hostname on each line when -P is set --- psshlib/task.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/psshlib/task.py b/psshlib/task.py index c17cc96..7282ec7 100644 --- a/psshlib/task.py +++ b/psshlib/task.py @@ -218,9 +218,8 @@ class Task(object): if self.outfile: self.writer.write(self.outfile, buf) if self.print_out: - sys.stdout.write('%s: %s' % (self.host, buf)) - if buf[-1] != '\n': - sys.stdout.write('\n') + for l in buf.split('\n'): + sys.stdout.write("%s: %s\n" % (self.host, l)) else: self.close_stdout(iomap) except (OSError, IOError): -- 2.2.0 ++++++ 0002-Fix-quiet-option-after-API-patch.patch ++++++ >From 33f1943171e1840a167a69f9717ff2a14b1d822f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <[email protected]> Date: Wed, 24 Dec 2014 17:01:45 +0100 Subject: [PATCH 2/2] Fix quiet option after API patch --- psshlib/callbacks.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/psshlib/callbacks.py b/psshlib/callbacks.py index a00126b..8cb93f7 100644 --- a/psshlib/callbacks.py +++ b/psshlib/callbacks.py @@ -30,10 +30,11 @@ class DefaultCallbacks(object): failure = "[FAILURE]" stderr = "Stderr: " host = task.pretty_host - if task.failures: - print(' '.join((progress, tstamp, failure, host, error))) - else: - print(' '.join((progress, tstamp, success, host))) + if not task.quiet: + if task.failures: + print(' '.join((progress, tstamp, failure, host, error))) + else: + print(' '.join((progress, tstamp, success, host))) # NOTE: The extra flushes are to ensure that the data is output in # the correct order with the C implementation of io. if task.outputbuffer: -- 2.2.0 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
