Commit 607eb34
committed
ceph-volume: fix regex usage in
- Updated the regex pattern to `r'(\d+\.?)+'` to more accurately
capture version numbers.
- Replaced `re.match` with `re.search` to properly match the cryptsetup
version in the output.
- `re.match` only checks for a match at the beginning of the string,
while `re.search` looks for a match anywhere in the string.
This fix ensures that the function correctly retrieves the
cryptsetup version from the output.
Fixes: https://tracker.ceph.com/issues/66393
Signed-off-by: Guillaume Abrioux <[email protected]>set_dmcrypt_no_workqueue
1 parent 73b599d commit 607eb34
File tree
2 files changed
+41
-3
lines changed- src/ceph-volume/ceph_volume
- tests/util
- util
2 files changed
+41
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
4 | 42 | | |
5 | 43 | | |
6 | 44 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
| 44 | + | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| |||
0 commit comments