Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pssh for openSUSE:Factory checked in
at 2022-03-30 20:36:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pssh (Old)
and /work/SRC/openSUSE:Factory/.pssh.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pssh"
Wed Mar 30 20:36:28 2022 rev:3 rq:966042 version:2.3.4+git10.d4909c9
Changes:
--------
--- /work/SRC/openSUSE:Factory/pssh/pssh.changes 2021-09-02
23:20:38.576578027 +0200
+++ /work/SRC/openSUSE:Factory/.pssh.new.1900/pssh.changes 2022-03-30
20:36:44.845356856 +0200
@@ -1,0 +2,10 @@
+Wed Mar 23 11:36:50 UTC 2022 - Yan Gao <y...@suse.com>
+
+- spec: use python3_sitelib macro rather than python_sitelib
+- bin: fix inconsistent use of tabs and spaces in indentation
+- psshlib: fix invalid syntax of except
+
+- Update:
+ * 0008-openSUSE-add-C-pcmk_nodes-option-to-get-list-of-node.patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pssh.spec ++++++
--- /var/tmp/diff_new_pack.t3BQCp/_old 2022-03-30 20:36:45.353357280 +0200
+++ /var/tmp/diff_new_pack.t3BQCp/_new 2022-03-30 20:36:45.361357287 +0200
@@ -1,7 +1,7 @@
#
# spec file for package pssh
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,8 +18,8 @@
%define pkg_version 2.3.4
%define python_version 3
-%if ! %{defined python_sitelib}
-%define python_sitelib /usr/lib/python3.6/site-packages/
+%if ! %{defined python3_sitelib}
+%define python3_sitelib /usr/lib/python3.6/site-packages/
%endif
Name: pssh
@@ -109,7 +109,7 @@
%files -n python-pssh
%license COPYING
%doc AUTHORS ChangeLog
-%{python_sitelib}/%{name}-%{pkg_version}*
-%{python_sitelib}/%{name}lib
+%{python3_sitelib}/%{name}-%{pkg_version}*
+%{python3_sitelib}/%{name}lib
%changelog
++++++ 0008-openSUSE-add-C-pcmk_nodes-option-to-get-list-of-node.patch ++++++
--- /var/tmp/diff_new_pack.t3BQCp/_old 2022-03-30 20:36:45.401357320 +0200
+++ /var/tmp/diff_new_pack.t3BQCp/_new 2022-03-30 20:36:45.405357324 +0200
@@ -32,7 +32,7 @@
for s in opts.host_strings:
hosts.extend(psshutil.parse_host_string(s,
default_user=opts.user))
+ if opts.pcmk_nodes:
-+ hosts += psshutil.get_pcmk_nodes()
++ hosts += psshutil.get_pcmk_nodes()
do_pnuke(hosts, pattern, opts)
diff --git a/bin/prsync b/bin/prsync
index 5e25786a90e8..d7868c87a945 100755
@@ -52,7 +52,7 @@
for s in opts.host_strings:
hosts.extend(psshutil.parse_host_string(s,
default_user=opts.user))
+ if opts.pcmk_nodes:
-+ hosts += psshutil.get_pcmk_nodes()
++ hosts += psshutil.get_pcmk_nodes()
do_prsync(hosts, local, remote, opts)
diff --git a/bin/pscp b/bin/pscp
index d569be7d5404..4408913ce077 100755
@@ -72,7 +72,7 @@
for s in opts.host_strings:
hosts.extend(psshutil.parse_host_string(s,
default_user=opts.user))
+ if opts.pcmk_nodes:
-+ hosts += psshutil.get_pcmk_nodes()
++ hosts += psshutil.get_pcmk_nodes()
do_pscp(hosts, localargs, remote, opts)
diff --git a/bin/pslurp b/bin/pslurp
index c7dece656f1b..0f17b5bc87d9 100755
@@ -92,7 +92,7 @@
for s in opts.host_strings:
hosts.extend(psshutil.parse_host_string(s,
default_user=opts.user))
+ if opts.pcmk_nodes:
-+ hosts += psshutil.get_pcmk_nodes()
++ hosts += psshutil.get_pcmk_nodes()
do_pslurp(hosts, remote, local, opts)
diff --git a/bin/pssh b/bin/pssh
index 5b6c2a5e4661..cf02f40c2fbd 100755
@@ -112,9 +112,9 @@
sys.stderr.write('Could not open hosts file: %s\n' % e.strerror)
sys.exit(1)
+ if opts.pcmk_nodes:
-+ hosts = psshutil.get_pcmk_nodes()
-+ if not hosts:
-+ sys.exit(1)
++ hosts = psshutil.get_pcmk_nodes()
++ if not hosts:
++ sys.exit(1)
if opts.host_strings:
for s in opts.host_strings:
hosts.extend(psshutil.parse_host_string(s,
default_user=opts.user))
@@ -162,7 +162,7 @@
+ outp = p.communicate()[0]
+ p.wait()
+ rc = p.returncode
-+ except IOError, msg:
++ except IOError as msg:
+ sys.stderr.write('%s failed: %s\n' % (cmd,msg))
+ return hosts
+ if rc != 0:
