pool/fence-agents
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87cf36efdf
fence-agents/0001-Use-Python-3-for-all-scripts-bsc-1065966.patch

223 lines
6.3 KiB
Diff
Raw Normal View History

- Update to version 4.0.25+git.1509350522.8d6f8530 (bsc#1065966): * Use Python 3 for all scripts * compute: Fix unfencing and ensure fencing occurs in partial up/down states * compute: Split out evacation functionality * compute: Handle differences in Nova API argument passing * fence_zvm: fix "uintptr_t" undeclared * fence_ifmib: fix README typo(s) - Add patch: * 0001-Use-Python-3-for-all-scripts-bsc-1065966.patch - Remove merged patches: * 0001-fence_compute-Only-list-nova-compute-services-when-g.patch * 0002-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch * 0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch * 0004-fence_compute-Fix-handling-of-domain-None.patch * 0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch * 0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch * 0007-fence_compute-Remove-duplicate-check-for-binary-name.patch * 0009-fence_compute-Fix-disabling-force_down-on-node-when-.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=72
2017-11-01 10:31:59 +01:00
From 67d60e07804f59512bd673fdb5bc020c02c48bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Wed, 1 Nov 2017 10:28:22 +0100
Subject: [PATCH] Use Python 3 for all scripts (bsc#1065966)
---
fence/agents/autodetect/autodetect.py | 2 +-
fence/agents/autodetect/autodetect_test.py | 2 +-
fence/agents/autodetect/fence_apc.py | 2 +-
fence/agents/autodetect/fence_bladecenter.py | 2 +-
fence/agents/autodetect/fence_brocade.py | 2 +-
fence/agents/autodetect/fence_ilo_moonshot.py | 2 +-
fence/agents/autodetect/fence_lpar.py | 2 +-
fence/agents/autodetect/fencing.py | 2 +-
fence/agents/lib/tests/test_fencing.py | 2 +-
fence/agents/powerman/fence_powerman.py | 2 +-
tests/fence_testing_test.py | 2 +-
tests/test-apc2.py | 4 ++--
tests/test-apc5.py | 4 ++--
tests/test-drac4.py | 4 ++--
tests/test-multi-apc2.py | 4 ++--
tests/test.py | 4 ++--
16 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/fence/agents/autodetect/autodetect.py b/fence/agents/autodetect/autodetect.py
index 24d9a731..366e5212 100755
--- a/fence/agents/autodetect/autodetect.py
+++ b/fence/agents/autodetect/autodetect.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import pexpect
import re
diff --git a/fence/agents/autodetect/autodetect_test.py b/fence/agents/autodetect/autodetect_test.py
index a18aaed0..462c469d 100755
--- a/fence/agents/autodetect/autodetect_test.py
+++ b/fence/agents/autodetect/autodetect_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import unittest
import autodetect as detect
diff --git a/fence/agents/autodetect/fence_apc.py b/fence/agents/autodetect/fence_apc.py
index c6dd106e..935f18e8 100644
--- a/fence/agents/autodetect/fence_apc.py
+++ b/fence/agents/autodetect/fence_apc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
#####
##
diff --git a/fence/agents/autodetect/fence_bladecenter.py b/fence/agents/autodetect/fence_bladecenter.py
index d72c07f1..dbcdb0d8 100644
--- a/fence/agents/autodetect/fence_bladecenter.py
+++ b/fence/agents/autodetect/fence_bladecenter.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
#####
##
diff --git a/fence/agents/autodetect/fence_brocade.py b/fence/agents/autodetect/fence_brocade.py
index 5257bccb..f1df7a23 100644
--- a/fence/agents/autodetect/fence_brocade.py
+++ b/fence/agents/autodetect/fence_brocade.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
import sys, re
import atexit
diff --git a/fence/agents/autodetect/fence_ilo_moonshot.py b/fence/agents/autodetect/fence_ilo_moonshot.py
index e161ac65..a7e827bb 100644
--- a/fence/agents/autodetect/fence_ilo_moonshot.py
+++ b/fence/agents/autodetect/fence_ilo_moonshot.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
import sys
import atexit
diff --git a/fence/agents/autodetect/fence_lpar.py b/fence/agents/autodetect/fence_lpar.py
index 6676e1c6..59cc2213 100644
--- a/fence/agents/autodetect/fence_lpar.py
+++ b/fence/agents/autodetect/fence_lpar.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
#####
##
diff --git a/fence/agents/autodetect/fencing.py b/fence/agents/autodetect/fencing.py
index ea21ace1..5d891eee 100644
--- a/fence/agents/autodetect/fencing.py
+++ b/fence/agents/autodetect/fencing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
import sys, getopt, time, os, uuid, pycurl, stat
import pexpect, re, syslog
diff --git a/fence/agents/lib/tests/test_fencing.py b/fence/agents/lib/tests/test_fencing.py
index 6ee93858..389e9746 100644
--- a/fence/agents/lib/tests/test_fencing.py
+++ b/fence/agents/lib/tests/test_fencing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import unittest
import sys
diff --git a/fence/agents/powerman/fence_powerman.py b/fence/agents/powerman/fence_powerman.py
index 962fdb8f..7aeeaf12 100755
--- a/fence/agents/powerman/fence_powerman.py
+++ b/fence/agents/powerman/fence_powerman.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@PYTHON@ -tt
import os
import time
from datetime import datetime
diff --git a/tests/fence_testing_test.py b/tests/fence_testing_test.py
index 36b2a5e0..9da9d0cf 100755
--- a/tests/fence_testing_test.py
+++ b/tests/fence_testing_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import unittest
import fence_testing
diff --git a/tests/test-apc2.py b/tests/test-apc2.py
index bb5aefd8..bc120dcb 100755
--- a/tests/test-apc2.py
+++ b/tests/test-apc2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from fence_testing import test_action
@@ -14,4 +14,4 @@ def main():
test_action(DEVICE, ACT_LIST, "getopt")
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
diff --git a/tests/test-apc5.py b/tests/test-apc5.py
index 6cea3b1c..8c24ecf5 100755
--- a/tests/test-apc5.py
+++ b/tests/test-apc5.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from fence_testing import test_action
@@ -14,4 +14,4 @@ def main():
test_action(DEVICE, ACT_LIST, "getopt")
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
diff --git a/tests/test-drac4.py b/tests/test-drac4.py
index 75c24c51..d4b14cb2 100755
--- a/tests/test-drac4.py
+++ b/tests/test-drac4.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from fence_testing import test_action
@@ -12,4 +12,4 @@ def main():
test_action(DRAC4, ACT_ONOFF, "stdin")
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
diff --git a/tests/test-multi-apc2.py b/tests/test-multi-apc2.py
index 7ab9754d..1c03912e 100755
--- a/tests/test-multi-apc2.py
+++ b/tests/test-multi-apc2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from fence_testing import test_action
@@ -14,4 +14,4 @@ def main():
test_action(DEVICE, ACT_LIST, "getopt")
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
diff --git a/tests/test.py b/tests/test.py
index 8e82ed98..4204fae5 100755
--- a/tests/test.py
+++ b/tests/test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from fence_testing import test_action
@@ -18,4 +18,4 @@ def main():
test_action(DUMMYDEF, ACT_ONOFF, "getopt")
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
--
2.14.2
Reference in New Issue Copy Permalink