summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-11-24 17:40:47 +0000
committerFrancois Pons <fpons@mandriva.com>2000-11-24 17:40:47 +0000
commit44f7ca085af75698e0bd60c9c9e5f73427529f1a (patch)
tree30e39cc53843f3bed72834b5e03e4957ef7eec4e
parent8417092eb2c88112b1949f3046360173ac0d2805 (diff)
downloaddrakx-44f7ca085af75698e0bd60c9c9e5f73427529f1a.tar
drakx-44f7ca085af75698e0bd60c9c9e5f73427529f1a.tar.gz
drakx-44f7ca085af75698e0bd60c9c9e5f73427529f1a.tar.bz2
drakx-44f7ca085af75698e0bd60c9c9e5f73427529f1a.tar.xz
drakx-44f7ca085af75698e0bd60c9c9e5f73427529f1a.zip
avoid .la files for selection.
-rw-r--r--perl-install/pkgs.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index eb0b5323a..5c78fbbf6 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -995,7 +995,7 @@ sub selectPackagesToUpgrade($$$;$$) {
} else {
if (! exists $obsoletedPackages{$name || c::headerGetEntry($header, 'name')}) {
my @files = c::headerGetEntry($header, 'filenames');
- @installedFilesForUpgrade{grep { ($_ !~ m|^/etc/rc.d/| &&
+ @installedFilesForUpgrade{grep { ($_ !~ m|^/etc/rc.d/| && $_ !~ m|\.la$| &&
! -d "$prefix/$_" && ! -l "$prefix/$_") } @files} = ();
}
}
@@ -1029,7 +1029,7 @@ sub selectPackagesToUpgrade($$$;$$) {
my ($header) = @_;
$cumulSize += c::headerGetEntry($header, 'size');
my @files = c::headerGetEntry($header, 'filenames');
- @installedFilesForUpgrade{grep { ($_ !~ m|^/etc/rc.d/| &&
+ @installedFilesForUpgrade{grep { ($_ !~ m|^/etc/rc.d/| && $_ !~ m|\.la$| &&
! -d "$prefix/$_" && ! -l "$prefix/$_") } @files} = ();
});
@@ -1069,10 +1069,10 @@ sub selectPackagesToUpgrade($$$;$$) {
unless (packageFlagSelected($p)) {
my $toSelect = 0;
$ask_child->(packageName($p), "files", sub {
- if ($_[0] !~ m|^/etc/rc.d/| && exists $installedFilesForUpgrade{$_[0]}) {
+ if ($_[0] !~ m|^/etc/rc.d/| && $_ !~ m|\.la$| && exists $installedFilesForUpgrade{$_[0]}) {
++$toSelect if ! -d "$prefix/$_[0]" && ! -l "$prefix/$_[0]";
- delete $installedFilesForUpgrade{$_[0]};
}
+ delete $installedFilesForUpgrade{$_[0]};
});
if ($toSelect) {
if ($toSelect <= 1 && packageName($p) =~ /-devel/) {