d7ed967e78
- Update to version 1.1.18+20180104.7ba28d854: - tools: improve crm_standby option handling - tools: improve crm_standby help and error messages - tools: improve crm_master option handling - tools: improve crm_master help and error messages - tools: remove deprecated stonith_admin option (fate#324508) - tools: remove deprecated crm_verify option (fate#324508) - tools: remove deprecated crm_attribute --node-uuid option (fate#324508) - tools: avoid using deprecated options - tools: remove deprecated crm_resource options (fate#324508) - libpe_status: use consistent monitor for implicit remotes - all: overhaul log locations (fate#324508) - spec: Switch dependencies from python to python3 (fate#323526) - tests: Switch shebang from /usr/bin/python to /usr/bin/python3 (fate#323526) * fate-323526_pacemaker-tests-shebang-python3.patch OBS-URL: https://build.opensuse.org/request/show/562043 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=291
82 lines
3.0 KiB
Diff
82 lines
3.0 KiB
Diff
Index: pacemaker-1.1.18+20180101.494eacba4/cts/CIB.py
|
|
===================================================================
|
|
--- pacemaker-1.1.18+20180101.494eacba4.orig/cts/CIB.py
|
|
+++ pacemaker-1.1.18+20180101.494eacba4/cts/CIB.py
|
|
@@ -403,7 +403,7 @@ Description=Dummy resource that takes a
|
|
|
|
[Service]
|
|
Type=notify
|
|
-ExecStart=/usr/bin/python -c 'import time, systemd.daemon; time.sleep(10); systemd.daemon.notify("READY=1"); time.sleep(86400)'
|
|
+ExecStart=/usr/bin/python3 -c 'import time, systemd.daemon; time.sleep(10); systemd.daemon.notify("READY=1"); time.sleep(86400)'
|
|
ExecStop=/bin/sh -c 'sleep 10; [ -n "\$MAINPID" ] && kill -s KILL \$MAINPID'
|
|
"""
|
|
|
|
Index: pacemaker-1.1.18+20180101.494eacba4/cts/CTSlab.py
|
|
===================================================================
|
|
--- pacemaker-1.1.18+20180101.494eacba4.orig/cts/CTSlab.py
|
|
+++ pacemaker-1.1.18+20180101.494eacba4/cts/CTSlab.py
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/python
|
|
+#!/usr/bin/python3
|
|
|
|
'''CTS: Cluster Testing System: Lab environment module
|
|
'''
|
|
Index: pacemaker-1.1.18+20180101.494eacba4/cts/OCFIPraTest.py
|
|
===================================================================
|
|
--- pacemaker-1.1.18+20180101.494eacba4.orig/cts/OCFIPraTest.py
|
|
+++ pacemaker-1.1.18+20180101.494eacba4/cts/OCFIPraTest.py
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/python
|
|
+#!/usr/bin/python3
|
|
|
|
'''OCF IPaddr/IPaddr2 Resource Agent Test'''
|
|
|
|
Index: pacemaker-1.1.18+20180101.494eacba4/lrmd/regression.py.in
|
|
===================================================================
|
|
--- pacemaker-1.1.18+20180101.494eacba4.orig/lrmd/regression.py.in
|
|
+++ pacemaker-1.1.18+20180101.494eacba4/lrmd/regression.py.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/python
|
|
+#!/usr/bin/python3
|
|
""" Regression tests for Pacemaker's lrmd
|
|
"""
|
|
|
|
@@ -412,7 +412,7 @@ class Tests(object):
|
|
os.system("dd if=/dev/urandom of=/etc/pacemaker/authkey bs=4096 count=1")
|
|
|
|
### Make fake systemd daemon and unit file ###
|
|
- dummy_daemon = """#!/usr/bin/python
|
|
+ dummy_daemon = """#!/usr/bin/python3
|
|
import time, systemd.daemon
|
|
time.sleep(3)
|
|
systemd.daemon.notify("READY=1")
|
|
@@ -432,7 +432,7 @@ description "Dummy service for regre
|
|
exec dd if=/dev/random of=/dev/null
|
|
""")
|
|
|
|
- dummy_fence_sleep_agent = ("""#!/usr/bin/python
|
|
+ dummy_fence_sleep_agent = ("""#!/usr/bin/python3
|
|
import sys
|
|
import time
|
|
def main():
|
|
Index: pacemaker-1.1.18+20180101.494eacba4/fencing/fence_dummy
|
|
===================================================================
|
|
--- pacemaker-1.1.18+20180101.494eacba4.orig/fencing/fence_dummy
|
|
+++ pacemaker-1.1.18+20180101.494eacba4/fencing/fence_dummy
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/python
|
|
+#!/usr/bin/python3
|
|
"""Dummy fence agent for testing
|
|
"""
|
|
|
|
Index: pacemaker-1.1.18+20180101.494eacba4/fencing/regression.py.in
|
|
===================================================================
|
|
--- pacemaker-1.1.18+20180101.494eacba4.orig/fencing/regression.py.in
|
|
+++ pacemaker-1.1.18+20180101.494eacba4/fencing/regression.py.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/python
|
|
+#!/usr/bin/python3
|
|
""" Regression tests for Pacemaker's stonithd
|
|
"""
|
|
|