diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-09-19 12:09:00 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-09-19 12:09:00 +0000 |
| commit | d4c71c867809bc54780b9b33717dc49e49cae686 (patch) | |
| tree | 53d7f4035c7cd1567d3ea955ad49643263684921 | |
| parent | 0b375d282b7d506269eb6704ee0b47b823106cf2 (diff) | |
| download | urpmi-d4c71c867809bc54780b9b33717dc49e49cae686.tar urpmi-d4c71c867809bc54780b9b33717dc49e49cae686.tar.gz urpmi-d4c71c867809bc54780b9b33717dc49e49cae686.tar.bz2 urpmi-d4c71c867809bc54780b9b33717dc49e49cae686.tar.xz urpmi-d4c71c867809bc54780b9b33717dc49e49cae686.zip | |
fixes for possible error trying to remove and avoid error message
which are more or less only warning (typical after 7.2 update).
| -rw-r--r-- | urpm.pm | 10 | ||||
| -rw-r--r-- | urpmi.spec | 6 |
2 files changed, 10 insertions, 6 deletions
@@ -826,7 +826,7 @@ sub filter_active_media { my $id = delete $fullname2id{$fullname}; defined $id and $urpm->{params}{depslist}[$id]{active} = 1; } else { - $urpm->{error}(_("unable to parse correctly [%s] on value \"%s\"", "$urpm->{statedir}/$medium->{hdlist}", $_)); + $urpm->{log}(_("unable to parse correctly [%s] on value \"%s\"", "$urpm->{statedir}/$medium->{hdlist}", $_)); } } } @@ -1509,7 +1509,7 @@ sub get_source_packages { if (my ($fullname, $file) = /^([^:\s]*-[^:\-\s]+-[^:\-\s]+\.[^:\.\-\s]*)(?::(\S+))?/) { $file2fullnames{$file || $fullname}{$fullname} = undef; } else { - $urpm->{error}(_("unable to parse correctly [%s] on value \"%s\"", "$urpm->{statedir}/$medium->{hdlist}", $_)); + $urpm->{log}(_("unable to parse correctly [%s] on value \"%s\"", "$urpm->{statedir}/$medium->{hdlist}", $_)); } } } @@ -1692,9 +1692,9 @@ sub select_packages_to_upgrade { #- used for package that are not correctly updated. #- should only be used when nothing else can be done correctly. my %upgradeNeedRemove = ( - 'libstdc++' => 1, - 'compat-glibc' => 1, - 'compat-libs' => 1, + #'libstdc++' => 1, + #'compat-glibc' => 1, + #'compat-libs' => 1, ); #- help removing package which may have different release numbering @@ -2,7 +2,7 @@ Name: urpmi Version: 1.7 -Release: 12mdk +Release: 13mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -114,6 +114,10 @@ rm -f /var/lib/urpmi/depslist %changelog +* Wed Sep 19 2001 François Pons <fpons@mandrakesoft.com> 1.7-13mdk +- avoid possible error on trying to remove package. +- avoid error message which are more warning. + * Mon Sep 17 2001 François Pons <fpons@mandrakesoft.com> 1.7-12mdk - fixed urpmq usage of urpm library. |