summaryrefslogtreecommitdiffstats
path: root/perl-install/pkgs.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-01-10 15:44:20 +0000
committerFrancois Pons <fpons@mandriva.com>2000-01-10 15:44:20 +0000
commit3a2545452f8ddb6bfe8eee02c313769d38f74300 (patch)
treefeb82786c2d23c22f26e5b4e43bd1c9421ddc2d7 /perl-install/pkgs.pm
parent4fe837d51fcc99ac6d1e80463b5e13520b250839 (diff)
downloaddrakx-3a2545452f8ddb6bfe8eee02c313769d38f74300.tar
drakx-3a2545452f8ddb6bfe8eee02c313769d38f74300.tar.gz
drakx-3a2545452f8ddb6bfe8eee02c313769d38f74300.tar.bz2
drakx-3a2545452f8ddb6bfe8eee02c313769d38f74300.tar.xz
drakx-3a2545452f8ddb6bfe8eee02c313769d38f74300.zip
*** empty log message ***
Diffstat (limited to 'perl-install/pkgs.pm')
-rw-r--r--perl-install/pkgs.pm12
1 files changed, 12 insertions, 0 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 4285ec229..a905b9284 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -396,6 +396,12 @@ sub selectPackagesToUpgrade($$$;$$) {
local $_; #- else perl complains on the map { ... } grep { ... } @...;
my %installedFilesForUpgrade; #- help searching package to upgrade in regard to already installed files.
+ #- used for package that are not correctly updated.
+ my %upgradeNeedRemove = (
+ 'compat-glibc' => 1,
+ 'compat-libs' => 1,
+ );
+
#- help removing package which may have different release numbering
my %toRemove; map { $toRemove{$_} = 1 } @{$toRemove || []};
@@ -423,6 +429,12 @@ sub selectPackagesToUpgrade($$$;$$) {
} else {
$p->{installed} = 1;
}
+ } elsif ($upgradeNeedRemove{$p->{name}}) {
+ my $otherPackage = (c::headerGetEntry($header, 'name'). '-' .
+ c::headerGetEntry($header, 'version'). '-' .
+ c::headerGetEntry($header, 'release'));
+ log::l("removing $otherPackage since it will not upgrade correctly!");
+ $toRemove{$otherPackage} = 1; #- force removing for theses other packages, select our.
}
} else {
my @files = c::headerGetEntry($header, 'filenames');