summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-09-20 14:14:10 +0000
committerFrancois Pons <fpons@mandriva.com>2001-09-20 14:14:10 +0000
commit73ecd82d2ba482ebbcac8eaef0f39f259bca2ebf (patch)
tree2bdcac2c618da9608c49d17027c3626425d8d3b2 /perl-install
parentfe83965f3879a12f5debfe571886c0bf3a344f43 (diff)
downloaddrakx-73ecd82d2ba482ebbcac8eaef0f39f259bca2ebf.tar
drakx-73ecd82d2ba482ebbcac8eaef0f39f259bca2ebf.tar.gz
drakx-73ecd82d2ba482ebbcac8eaef0f39f259bca2ebf.tar.bz2
drakx-73ecd82d2ba482ebbcac8eaef0f39f259bca2ebf.tar.xz
drakx-73ecd82d2ba482ebbcac8eaef0f39f259bca2ebf.zip
take care not probing in /dev/ for finding package to upgrade, this cause
problem in live_upgrade.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/pkgs.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 76ebba342..c7727c40d 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -1078,7 +1078,7 @@ sub selectPackagesToUpgrade($$$;$$) {
} else {
if (! exists $obsoletedPackages{c::headerGetEntry($header, 'name')}) {
my @files = c::headerGetEntry($header, 'filenames');
- @installedFilesForUpgrade{grep { ($_ !~ m|^/etc/rc.d/| && $_ !~ m|\.la$| &&
+ @installedFilesForUpgrade{grep { ($_ !~ m|^/dev/| && $_ !~ m|^/etc/rc.d/| && $_ !~ m|\.la$| &&
! -d "$prefix/$_" && ! -l "$prefix/$_") } @files} = ();
}
}
@@ -1111,7 +1111,7 @@ sub selectPackagesToUpgrade($$$;$$) {
my ($header) = @_;
$cumulSize += c::headerGetEntry($header, 'size');
my @files = c::headerGetEntry($header, 'filenames');
- @installedFilesForUpgrade{grep { ($_ !~ m|^/etc/rc.d/| && $_ !~ m|\.la$| &&
+ @installedFilesForUpgrade{grep { ($_ !~ m|^/dev/| && $_ !~ m|^/etc/rc.d/| && $_ !~ m|\.la$| &&
! -d "$prefix/$_" && ! -l "$prefix/$_") } @files} = ();
});
@@ -1147,7 +1147,7 @@ sub selectPackagesToUpgrade($$$;$$) {
unless (packageFlagSelected($p)) {
my $toSelect = 0;
$ask_child->(packageName($p), "files", sub {
- if ($_[0] !~ m|^/etc/rc.d/| && $_ !~ m|\.la$| && exists $installedFilesForUpgrade{$_[0]}) {
+ if ($_[0] !~ m|^/dev/| && $_[0] !~ m|^/etc/rc.d/| && $_ !~ m|\.la$| && exists $installedFilesForUpgrade{$_[0]}) {
++$toSelect if ! -d "$prefix/$_[0]" && ! -l "$prefix/$_[0]";
}
delete $installedFilesForUpgrade{$_[0]};