Skip to content

Fix warning when setup cloudstack-common #4523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 1 commit into from
Dec 9, 2020
Merged

Fix warning when setup cloudstack-common #4523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions python/lib/cloud_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ def check_kvm():
except CalledProcessError:
raise CheckFailed("KVM is not correctly installed on this system, or support for it is not enabled in the BIOS")
except OSError as e:
if e.errno is errno.ENOENT: raise CheckFailed("KVM is not correctly installed on this system, or support for it is not enabled in the BIOS")
if e.errno == errno.ENOENT: raise CheckFailed("KVM is not correctly installed on this system, or support for it is not enabled in the BIOS")
raise
return True
raise AssertionError("check_kvm() should have never reached this part")
Expand Down Expand Up @@ -431,7 +431,7 @@ def done(self):
alreadysetup = augtool.match("/files/etc/network/interfaces/iface",self.brname).stdout.strip()
return alreadysetup
except OSError as e:
if e.errno is 2: raise TaskFailed("augtool has not been properly installed on this system")
if e.errno == 2: raise TaskFailed("augtool has not been properly installed on this system")
raise

def restore_state(self):
Expand Down Expand Up @@ -646,7 +646,7 @@ def done(self):
try:
return "group virt" in open("/etc/cgconfig.conf","r").read(-1)
except IOError as e:
if e.errno is 2: raise TaskFailed("cgconfig has not been properly installed on this system")
if e.errno == 2: raise TaskFailed("cgconfig has not been properly installed on this system")
raise

def execute(self):
Expand All @@ -672,7 +672,7 @@ def done(self):
try:
return self.cfgline in open("/etc/cgrules.conf","r").read(-1)
except IOError as e:
if e.errno is 2: raise TaskFailed("cgrulesd has not been properly installed on this system")
if e.errno == 2: raise TaskFailed("cgrulesd has not been properly installed on this system")
raise

def execute(self):
Expand All @@ -693,7 +693,7 @@ def done(self):
try:
return self.cfgline in open(self.filename,"r").read(-1)
except IOError as e:
if e.errno is 2: raise TaskFailed("qemu has not been properly installed on this system")
if e.errno == 2: raise TaskFailed("qemu has not been properly installed on this system")
raise

def execute(self):
Expand All @@ -712,7 +712,7 @@ def done(self):
else: raise AssertionError("We should not reach this")
return self.cfgline in open(libvirtfile,"r").read(-1)
except IOError as e:
if e.errno is 2: raise TaskFailed("libvirt has not been properly installed on this system")
if e.errno == 2: raise TaskFailed("libvirt has not been properly installed on this system")
raise

def execute(self):
Expand Down Expand Up @@ -742,7 +742,7 @@ def done(self):
lines = [ s.strip() for s in open("/etc/libvirt/libvirtd.conf").readlines() ]
if all( [ stanza in lines for stanza in self.stanzas ] ): return True
except IOError as e:
if e.errno is 2: raise TaskFailed("libvirt has not been properly installed on this system")
if e.errno == 2: raise TaskFailed("libvirt has not been properly installed on this system")
raise

def execute(self):
Expand Down