diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-08-28 12:30:17 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-08-28 12:30:17 +0000 |
| commit | c9e1918760165314996e15654a842eafd280e7b1 (patch) | |
| tree | 77155882a01b12d25286a952c95e08f451dc7962 | |
| parent | 79920320581efec1fc906b2f8a9fd5cba3aa96e0 (diff) | |
| download | drakx-backup-do-not-use-c9e1918760165314996e15654a842eafd280e7b1.tar drakx-backup-do-not-use-c9e1918760165314996e15654a842eafd280e7b1.tar.gz drakx-backup-do-not-use-c9e1918760165314996e15654a842eafd280e7b1.tar.bz2 drakx-backup-do-not-use-c9e1918760165314996e15654a842eafd280e7b1.tar.xz drakx-backup-do-not-use-c9e1918760165314996e15654a842eafd280e7b1.zip | |
(is_same_hd): add ugly support for davfs devices (http://...) comparison without the ending "/"
| -rw-r--r-- | perl-install/fsedit.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 9765da02e..6efcffd0c 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -313,6 +313,9 @@ sub is_same_hd { my ($hd1, $hd2) = @_; if ($hd1->{major} && $hd2->{major}) { $hd1->{major} == $hd2->{major} && $hd1->{minor} == $hd2->{minor}; + } elsif (my ($s1) = $hd1->{device} =~ m|https?://(.+?)/*$|) { + my ($s2) = $hd2->{device} =~ m|https?://(.+?)/*$|; + $s1 eq $s2; } else { $hd1->{device} eq $hd2->{device}; } |