Change in vdsm[master]: Fix regular expression matching for lvm filter
ykaplan at redhat.com
ykaplan at redhat.com
Thu Feb 7 16:39:49 UTC 2013
Yeela Kaplan has uploaded a new change for review.
Change subject: Fix regular expression matching for lvm filter
......................................................................
Fix regular expression matching for lvm filter
Change-Id: Ia5428d3d8b1d0b10b083b663b12d3a6ceb7e3e69
Signed-off-by: Yeela Kaplan <ykaplan at redhat.com>
---
M tests/lvmTests.py
M vdsm/storage/lvm.py
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/52/11852/1
diff --git a/tests/lvmTests.py b/tests/lvmTests.py
index 2a82f61..33f751b 100644
--- a/tests/lvmTests.py
+++ b/tests/lvmTests.py
@@ -26,14 +26,14 @@
class LvmTests(TestCaseBase):
def test_buildFilter(self):
- chars = [' ', '$', '|', '"', '(']
+ chars = [' ', '$', '|', '(']
dev = 'a'
for c in chars:
dev += '\\' + hex(ord(c))[1:4]
devs = [dev]
filter = lvm._buildFilter(devs)
expectedFilter = ("filter = "
- "[ \'a%a\\\\x20\\\\x24\\\\x7c\\\\x22\\\\x28%\',"
+ "[ \'a%a\\\\x20\\\\x24\\\\x7c\\\\x28%\',"
" \'r%.*%\' ]"
)
self.assertEqual(expectedFilter, filter)
diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py
index 2a65b3e..9bdc5d7 100644
--- a/vdsm/storage/lvm.py
+++ b/vdsm/storage/lvm.py
@@ -126,7 +126,7 @@
USER_DEV_LIST = filter(None, config.get("irs", "lvm_dev_whitelist").split(","))
-re_dev = re.compile("\W")
+re_dev = re.compile('[^0-9A-Za-z*-.:=_"#]')
def _buildFilter(devList):
--
To view, visit http://gerrit.ovirt.org/11852
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5428d3d8b1d0b10b083b663b12d3a6ceb7e3e69
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan at redhat.com>
More information about the vdsm-patches
mailing list