From d41449068bc0df24cf199b02540343a4dc6ec93c Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 15 Jun 2004 15:30:26 +0000
Subject: rename is_same_part to are_same_partitions (not that much clear, but
 at least a little)

---
 perl-install/diskdrake/hd_gtk.pm      | 2 +-
 perl-install/diskdrake/interactive.pm | 2 +-
 perl-install/fsedit.pm                | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index c6ae7b4e4..197bbf1d9 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -295,7 +295,7 @@ sub create_buttons4partitions {
 	$w->set_name("PART_" . type2name($entry->{type}));
 	$w->set_size_request($entry->{size} * $ratio + $minwidth, 0);
 	gtkpack__($kind->{display_box}, $w);
-	$w->grab_focus if $current_entry && fsedit::is_same_part($current_entry, $entry);
+	$w->grab_focus if $current_entry && fsedit::are_same_partitions($current_entry, $entry);
     }
 }
 
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 19b59fa99..8a029c26b 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -972,7 +972,7 @@ sub Options {
 
 sub is_part_existing {
     my ($part, $all_hds) = @_;
-    $part && any { fsedit::is_same_part($part, $_) } fsedit::get_all_fstab_and_holes($all_hds);
+    $part && any { fsedit::are_same_partitions($part, $_) } fsedit::get_all_fstab_and_holes($all_hds);
 }
 
 sub modifyRAID {
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 8cdfe6d91..5e01c0839 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -335,7 +335,8 @@ sub is_same_hd {
     }
 }
 
-sub is_same_part {
+#- are_same_partitions() do not look at the device name since things may have changed
+sub are_same_partitions {
     my ($part1, $part2) = @_;
     foreach ('start', 'size', 'type', 'rootDevice') {
 	$part1->{$_} eq $part2->{$_} or return;
-- 
cgit v1.2.1