tyler.durden/hwraid
1
0
Fork 0
mirror of https://github.com/eLvErDe/hwraid.git synced 2025-07-23 22:04:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Numeration in format string and spaces to tab

Browse Source 
Old python versions can fall in `ValueError` exception with current string format:
```
$ python
Python 2.6.6 (r266:84292, Jun 14 2019, 09:43:27)
[GCC 4.4.7 20120313 (Red Hat 4.4.7-23)] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import re
>>> model = 'Z1Z3XMHGST4000NM0033-9ZM170 GA0A'
>>> m = re.match(r'(\w{8})(ST\w+)(?:-(\w{6}))?(?:\s+(\w+))', model)
>>> '{}-{} {} {}'.format(m.group(2), m.group(3), m.group(4), m.group(1))
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
ValueError: zero length field name in format
>>> m.group(2)
'ST4000NM0033'
>>> m.group(3)
'9ZM170'
>>> m.group(4)
'GA0A'
>>> m.group(1)
'Z1Z3XMHG'
```
Also corrected spaces to tabs.
This commit is contained in:
Alexey Bednyakov 2021-03-22 12:43:27 +03:00 committed by GitHub
parent a9a5b06bca
commit 717f64e837
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wrapper-scripts/megaclisas-status
View File

@ -485,11 +485,11 @@ def returnDiskInfo(output,controllerid):
m = re.match(r'(\w{8})(ST\w+)(?:-(\w{6}))?(?:\s+(\w+))', model)
if m:
if m.group(3):
model = '{}-{} {} {}'.format(m.group(2), m.group(3), m.group(4), m.group(1))
else:
model = '{} {:>10} {}'.format(m.group(2), m.group(4), m.group(1))
continue
if m.group(3):
model = '{0}-{1} {2} {3}'.format(m.group(2), m.group(3), m.group(4), m.group(1))
else:
model = '{0} {1:>10} {2}'.format(m.group(2), m.group(4), m.group(1))
continue
# Sub code
manuf = re.sub(' .*', '', model)
@ -586,11 +586,11 @@ def returnUnconfDiskInfo(output,controllerid):
m = re.match(r'(\w{8})(ST\w+)(?:-(\w{6}))?(?:\s+(\w+))', model)
if m:
if m.group(3):
model = '{}-{} {} {}'.format(m.group(2), m.group(3), m.group(4), m.group(1))
else:
model = '{} {:>10} {}'.format(m.group(2), m.group(4), m.group(1))
continue
if m.group(3):
model = '{0}-{1} {2} {3}'.format(m.group(2), m.group(3), m.group(4), m.group(1))
else:
model = '{0} {1:>10} {2}'.format(m.group(2), m.group(4), m.group(1))
continue
manuf = re.sub(' .*', '', model)
dtype = re.sub(manuf+' ', '', model)