Merge pull request #222 from Obihoernchen/rhel8

Fix #221: RHEL8 compatibility + v0.1.7
xcat2 · Apr 3, 2020 · 85ae30c · 85ae30c
2 parents f5576f6 + 83a86da
commit 85ae30c
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 17 deletions.
diff --git a/Version b/Version
@@ -1 +1 @@
-0.1.2
+0.1.7
diff --git a/xcat-inventory/cli/xcat-inventory b/xcat-inventory/cli/xcat-inventory
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 # -*- coding: utf-8 -*-
 #

diff --git a/xcat-inventory/tests/shell_test.py b/xcat-inventory/tests/shell_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 ###############################################################################
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################

diff --git a/xcat-inventory/xcat-inventory.spec b/xcat-inventory/xcat-inventory.spec
@@ -11,7 +11,11 @@ Vendor: IBM Corp.
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
 Prefix: /opt/xcat
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
+%if 0%{?rhel} >= 8
+Requires: python2-psycopg2 python2-sqlalchemy >= 0.8.0 python2-PyMySQL python2-pyyaml python2-six python2-jinja2 git
+%else
 Requires: python-psycopg2 python-sqlalchemy >= 0.8.0 MySQL-python PyYAML python-six python-jinja2 git
+%endif
 
 %ifos linux
 BuildArch: noarch

diff --git a/xcat-inventory/xcclient/inventory/backend.py b/xcat-inventory/xcclient/inventory/backend.py
@@ -1,13 +1,13 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 from __future__ import print_function
-import configparser
 import os
 import shutil
 import re
 import pickle
 import hashlib
 
+from six.moves import configparser
 from .exceptions import *
 from . import manager
 from . import utils

diff --git a/xcat-inventory/xcclient/inventory/dbfactory.py b/xcat-inventory/xcclient/inventory/dbfactory.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 from __future__ import print_function
 import sys
 

diff --git a/xcat-inventory/xcclient/inventory/dbobject.py b/xcat-inventory/xcclient/inventory/dbobject.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 import sys
 from copy import *

diff --git a/xcat-inventory/xcclient/inventory/dbsession.py b/xcat-inventory/xcclient/inventory/dbsession.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 ###############################################################################
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################

diff --git a/xcat-inventory/xcclient/inventory/exceptions.py b/xcat-inventory/xcclient/inventory/exceptions.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 ###############################################################################
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################

diff --git a/xcat-inventory/xcclient/inventory/inventorydiff.py b/xcat-inventory/xcclient/inventory/inventorydiff.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 
 from __future__ import print_function
 

diff --git a/xcat-inventory/xcclient/inventory/manager.py b/xcat-inventory/xcclient/inventory/manager.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 ###############################################################################
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################

diff --git a/xcat-inventory/xcclient/inventory/shell.py b/xcat-inventory/xcclient/inventory/shell.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 ###############################################################################
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################

diff --git a/xcat-inventory/xcclient/inventory/structurediff.py b/xcat-inventory/xcclient/inventory/structurediff.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 
 from __future__ import print_function
 import deepdiff

diff --git a/xcat-inventory/xcclient/inventory/utils.py b/xcat-inventory/xcclient/inventory/utils.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 ###############################################################################
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################

diff --git a/xcat-inventory/xcclient/inventory/vutil.py b/xcat-inventory/xcclient/inventory/vutil.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 ###############################################################################
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################

diff --git a/xcat-inventory/xcclient/inventory/xcatobj.py b/xcat-inventory/xcclient/inventory/xcatobj.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 ###############################################################################
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################

diff --git a/xcat-inventory/xcclient/shell.py b/xcat-inventory/xcclient/shell.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 ###############################################################################
 # IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################