summaryrefslogtreecommitdiffstats
path: root/iscsi.py
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2007-06-27 14:19:06 +0000
committerPeter Jones <pjones@redhat.com>2007-06-27 14:19:06 +0000
commita72370e7dfde8c0e61715b7bae9783204476f3ff (patch)
tree751d43bcfeef8aae6c63d93fc2d1f9d0592121e8 /iscsi.py
parent6793e9dadf0852f4b69b65d89b9fe4e2fd73209d (diff)
downloadanaconda-a72370e7dfde8c0e61715b7bae9783204476f3ff.tar.gz
anaconda-a72370e7dfde8c0e61715b7bae9783204476f3ff.tar.xz
anaconda-a72370e7dfde8c0e61715b7bae9783204476f3ff.zip
Fix rerror reporting in iscsi connection code.
Diffstat (limited to 'iscsi.py')
-rw-r--r--iscsi.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/iscsi.py b/iscsi.py
index 4922b0a33..6ae4e17ec 100644
--- a/iscsi.py
+++ b/iscsi.py
@@ -54,15 +54,18 @@ class iscsiTarget:
def _getPortal(self):
if self._portal is None:
argv = [ "-m", "node", "-p", self.ipaddr ]
+ log.debug("iscsiadm %s" %(string.join(argv),))
records = iutil.execWithCapture(ISCSIADM, argv)
+ records = records.strip()
for line in records.split("\n"):
+ log.debug(" %s" % (line,))
if not line or line.find("found!") != -1:
log.warn("no record found!")
- return None
+ continue
pnlist = line.split()
if len(pnlist) != 2:
log.warn("didn't get what we expected from iscsiadm")
- return None
+ continue
(portal, node) = pnlist
if portal.startswith(self.ipaddr):
self._portal = portal