Changeset 3689 in MondoRescue

Timestamp:

Oct 2, 2017, 12:35:02 PM (7 years ago)

Author:

Bruno Cornec

Message:

Revert a modification on what I thought was useless code !!

File:

• branches/3.3/mindi/mr-parted2fdisk (modified) (1 diff)

branches/3.3/mindi/mr-parted2fdisk

@@ -196 +196 @@
 # util-linux/fdisk version
 my $fdisk = pb_check_req("fdisk",0);
-#open(CMD,"$fdisk -v |") || die "Unable to execute $fdisk";
-#my $version = <CMD>;
-#close(CMD);
-#chomp($version);
-## RHEL 5 has fdisk from util-linux 2.13-pre7
-## Mageia 4 has fdisk from util-linux 2.24.2
-#$version =~ s/[^0-9\.]*([0-9a-z\.-]+)[\)]*$/$1/;
-#my ($v,$maj,$min) = split(/\./,$version);
-
-## Consider pre version the same as the following for formats
-#if ((defined $maj) && ($maj =~ /-pre/)) {
-#$maj =~ s/-pre.*$//;
-#$maj++;
-#}
-## Remove potential remaining letters
-#$maj =~ s/[a-z]+//;
-#
-#if ((defined $min) && ($min =~ /-pre/)) {
-#$min =~ s/-pre.*$//;
-#$min++;
-#}
-#$min =~ s/[a-z]+// if (defined $min);
+open(CMD,"$fdisk -v |") || die "Unable to execute $fdisk";
+my $version = <CMD>;
+close(CMD);
+chomp($version);
+# RHEL 5 has fdisk from util-linux 2.13-pre7
+# Mageia 4 has fdisk from util-linux 2.24.2
+$version =~ s/[^0-9\.]*([0-9a-z\.-]+)[\)]*$/$1/;
+my ($v,$maj,$min) = split(/\./,$version);
+
+# Consider pre version the same as the following for formats
+if ((defined $maj) && ($maj =~ /-pre/)) {
+    $maj =~ s/-pre.*$//;
+    $maj++;
+}
+# Remove potential remaining letters
+$maj =~ s/[a-z]+//;
+
+if ((defined $min) && ($min =~ /-pre/)) {
+    $min =~ s/-pre.*$//;
+    $min++;
+}
+$min =~ s/[a-z]+// if (defined $min);
 
 my %pid = ( "FAT" => "6",