Attachment 294352 Details for Bug 431924 – iscsi.patch

iscsi.patch

iscsi.patch (text/plain), 1.25 KB, created by James Laska on 2008-02-08 13:48:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Laska

Created: 2008-02-08 13:48:21 UTC

Size: 1.25 KB

patch

obsolete

>diff --git a/iscsi.py b/iscsi.py
>index cfa44dd..07409d8 100644
>--- a/iscsi.py
>+++ b/iscsi.py
>@@ -176,7 +176,7 @@ class iscsi(object):
>         self.initiatorSet = False
>         self.oldInitiatorFile = None
>         
>-        if self.fwinfo.has_key("iface.initiatorname"):
>+        if self.fwinfo and self.fwinfo.has_key("iface.initiatorname"):
>             self._initiator = self.fwinfo["iface.initiatorname"]
>             self.initiatorSet = True
>             self.startup()
>@@ -185,7 +185,7 @@ class iscsi(object):
>         if self._initiator != "":
>             return self._initiator
> 
>-        if self.fwinfo.has_key("iface.initiatorname"):
>+        if self.fwinfo and self.fwinfo.has_key("iface.initiatorname"):
>             return self.fwinfo["iface.initiatorname"]
>         else:
>             return randomIname()
>@@ -211,6 +211,9 @@ class iscsi(object):
> 
>         find_iscsi_files()
> 
>+        if not has_iscsi():
>+            return
>+
>         retval = {}
> 
>         argv = [ "-m", "fw" ]
>@@ -254,6 +257,9 @@ class iscsi(object):
>                 os.kill(pid, signal.SIGKILL)
> 
>     def shutdown(self):
>+        if not has_iscsi():
>+            return
>+
>         if flags.test:
>             if self.oldInitiatorFile != None:
>                 f = open(INITIATOR_FILE, "w")

Actions: View

Attachments on bug 431924: 294352