From 3a5fd47e26a3f597e8dc5cdc89ef5e7c0705dd85 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Mon, 4 Aug 2003 18:06:29 +0000 Subject: updated with newer perl-URPM --- perl-install/pkgs.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'perl-install/pkgs.pm') diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 14bccda38..e298670a1 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -107,7 +107,7 @@ sub selectedSize { } } #- but remove size of package being obsoleted or removed. - foreach ((map { /(.*)\.[^\.]*$/ } keys %{$packages->{state}{obsoleted}}), keys %{$packages->{state}{ask_remove}}) { + foreach (keys %{$packages->{state}{rejected}}) { my ($name) = /(.*)-[^\-]*-[^\-]*$/ or next; exists $skip{$name} and next; $skip{$name} = undef; $size -= $packages->{sizes}{$name}; @@ -954,10 +954,10 @@ sub install($$$;$$) { $pkg->set_flag_installed(1); $pkg->set_flag_upgrade(0); #- update obsoleted entry. - foreach (keys %{$packages->{state}{obsoleted}}) { - if (exists $packages->{state}{obsoleted}{$_}{$pkg->id}) { - delete $packages->{state}{obsoleted}{$_}{$pkg->id}; - %{$packages->{state}{obsoleted}{$_}} or delete $packages->{state}{obsoleted}{$_}; + foreach (keys %{$packages->{state}{rejected}}) { + if (exists $packages->{state}{rejected}{$_}{closure}{$pkg->fullname}) { + delete $packages->{state}{rejected}{$_}{closure}{$pkg->fullname}; + %{$packages->{state}{rejected}{$_}{closure}} or delete $packages->{state}{rejected}{$_}; } } } else { -- cgit v1.2.1