diff options
| author | Francois Pons <fpons@mandriva.com> | 1999-12-20 16:47:41 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 1999-12-20 16:47:41 +0000 |
| commit | ee55d090aa6af13799c803588369418d4fcb5897 (patch) | |
| tree | 87ab853b47b835f25deac9a4fc99298c2d3733e9 /perl-install/pkgs.pm | |
| parent | 65929aa8e5b2e999d820ca22c577099eec25c628 (diff) | |
| download | drakx-ee55d090aa6af13799c803588369418d4fcb5897.tar drakx-ee55d090aa6af13799c803588369418d4fcb5897.tar.gz drakx-ee55d090aa6af13799c803588369418d4fcb5897.tar.bz2 drakx-ee55d090aa6af13799c803588369418d4fcb5897.tar.xz drakx-ee55d090aa6af13799c803588369418d4fcb5897.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/pkgs.pm')
| -rw-r--r-- | perl-install/pkgs.pm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index a50f8a54e..8bfa04dd5 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -499,11 +499,15 @@ sub selectPackagesToUpgrade($$$;$$) { c::headerGetEntry($header, 'version'). '-' . c::headerGetEntry($header, 'release')); if ($toRemove{$otherPackage}) { - my @files = c::headerGetEntry($header, 'filenames'); - my @flags = c::headerGetEntry($header, 'fileflags'); - for my $i (0..$#flags) { - if ($flags[$i] & c::RPMFILE_CONFIG()) { - push @$toSave, $files[$i]; + if ($otherPackage =~ /^libtermcap/) { + delete $toRemove{$otherPackage}; #- keep it selected, but force upgrade. + } else { + my @files = c::headerGetEntry($header, 'filenames'); + my @flags = c::headerGetEntry($header, 'fileflags'); + for my $i (0..$#flags) { + if ($flags[$i] & c::RPMFILE_CONFIG()) { + push @$toSave, $files[$i] unless $files[$i] =~ /kdelnk/; #- avoid doublons for KDE. + } } } } |