24 lines
1.4 KiB
Diff
24 lines
1.4 KiB
Diff
|
commit d437358ac3debf7625aefda4d0bd387a91b69df5
|
||
|
|
Author: Tony George <teejeetech@gmail.com>
|
||
|
|
Date: Sun Jun 6 12:04:07 2021 +0530
|
||
|
|
|
||
|
|
Fix for #425, #753, #755
|
||
|
|
|
||
|
|
diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
|
||
|
|
index 18f09de..b276055 100755
|
||
|
|
--- a/src/Utility/Device.vala
|
||
|
|
+++ b/src/Utility/Device.vala
|
||
|
|
@@ -428,10 +428,10 @@ public class Device : GLib.Object{
|
||
|
|
|
||
|
|
try{
|
||
|
|
if (lsblk_is_ancient){
|
||
|
|
- rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
|
||
|
|
+ rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
|
||
|
|
}
|
||
|
|
else{
|
||
|
|
- rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
|
||
|
|
+ rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
|
||
|
|
}
|
||
|
|
|
||
|
|
if (rex.match (line, 0, out match)){
|