xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 03:32:04 +00:00
Code Issues Releases Wiki Activity

Remove trailing spaces in file xCAT-SoftLayer/lib/python/xcat/xcatutils.py

Browse Source
This commit is contained in:
GONG Jie 2017-12-31 23:59:59 +00:00
parent 860d37eb43
commit 01226f046c
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xCAT-SoftLayer/lib/python/xcat/xcatutils.py
View File

@ -10,8 +10,8 @@ class xCatError(Exception):
def __str__(self):
return repr(self.value)
def isMounted(mountPoint):
if os.path.ismount(mountPoint):
def isMounted(mountPoint):
if os.path.ismount(mountPoint):
return True
else:
return False
@ -33,21 +33,21 @@ def isRhel():
myDistro = platform.linux_distribution()
if "Red Hat Enterprise Linux Server" or "CentOS" in myDistro:
return True
else:
else:
return False
def isSles():
def isSles():
myDistro = platform.linux_distribution()
if "SUSE Linux Enterprise Server" in myDistro:
return True
else:
else:
return False
def isUbuntu():
myDistro = platform.linux_distribution()
if "Ubuntu" in myDistro:
return True
else:
else:
return False
def getUserInput(question):
@ -55,31 +55,31 @@ def getUserInput(question):
return response
def filterInstalledPackages(pkglist=[]):
fulllist = ""
fulllist = ""
if isRhel():
# using YUM
import yum
import yum
yb = yum.YumBase()
for x in pkglist:
if not yb.rpmdb.searchNevra(name='%s' %(x)):
fulllist += "%s " %(x)
fulllist += "%s " %(x)
return fulllist
def installPackages(pkglist=[]):
fulllist = filterInstalledPackages(pkglist)
if isRhel():
if fulllist.strip() != "":
if fulllist.strip() != "":
cmd = "yum -y install %s" %(fulllist)
out,err = xcatutils.run_command(cmd)
elif isSles():
elif isSles():
print "Using zyppr..."
elif isUbuntu():
print "Using apt-get..."
else:
print "Error!"
print "Error!"