|
 |
55a526 |
From b10c921a2d3bf2b84531ee7303a494919de67ae5 Mon Sep 17 00:00:00 2001
|
|
|
55a526 |
From: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
|
|
|
55a526 |
Date: Fri, 1 Jun 2018 14:05:14 +0530
|
|
|
55a526 |
Subject: [PATCH] saveconfig: handle no attr exception in _parse_info()
|
|
|
55a526 |
|
|
|
55a526 |
$ targetcli / saveconfig
|
|
|
55a526 |
'NoneType' object has no attribute 'group'
|
|
|
55a526 |
|
|
|
55a526 |
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
|
|
|
55a526 |
---
|
|
|
55a526 |
rtslib/tcm.py | 14 ++++++++++----
|
|
|
55a526 |
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
55a526 |
|
|
|
55a526 |
diff --git a/rtslib/tcm.py b/rtslib/tcm.py
|
|
|
55a526 |
index 4feb738..4ed96b4 100644
|
|
|
55a526 |
--- a/rtslib/tcm.py
|
|
|
55a526 |
+++ b/rtslib/tcm.py
|
|
|
55a526 |
@@ -184,8 +184,11 @@ class StorageObject(CFSNode):
|
|
|
55a526 |
def _parse_info(self, key):
|
|
|
55a526 |
self._check_self()
|
|
|
55a526 |
info = fread("%s/info" % self.path)
|
|
|
55a526 |
- return re.search(".*%s: ([^: ]+).*" \
|
|
|
55a526 |
- % key, ' '.join(info.split())).group(1)
|
|
|
55a526 |
+ try:
|
|
|
55a526 |
+ return re.search(".*%s: ([^: ]+).*" \
|
|
|
55a526 |
+ % key, ' '.join(info.split())).group(1)
|
|
|
55a526 |
+ except AttributeError:
|
|
|
55a526 |
+ return None
|
|
|
55a526 |
|
|
|
55a526 |
def _get_status(self):
|
|
|
55a526 |
self._check_self()
|
|
|
55a526 |
@@ -994,8 +997,11 @@ class _Backstore(CFSNode):
|
|
|
55a526 |
def _parse_info(self, key):
|
|
|
55a526 |
self._check_self()
|
|
|
55a526 |
info = fread("%s/hba_info" % self.path)
|
|
|
55a526 |
- return re.search(".*%s: ([^: ]+).*" \
|
|
|
55a526 |
- % key, ' '.join(info.split())).group(1)
|
|
|
55a526 |
+ try:
|
|
|
55a526 |
+ return re.search(".*%s: ([^: ]+).*" \
|
|
|
55a526 |
+ % key, ' '.join(info.split())).group(1)
|
|
|
55a526 |
+ except AttributeError:
|
|
|
55a526 |
+ return None
|
|
|
55a526 |
|
|
|
55a526 |
def _get_version(self):
|
|
|
55a526 |
self._check_self()
|
|
|
55a526 |
--
|
|
|
55a526 |
1.8.3.1
|
|
|
55a526 |
|