summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-08-04 18:06:29 +0000
committerFrancois Pons <fpons@mandriva.com>2003-08-04 18:06:29 +0000
commit3a5fd47e26a3f597e8dc5cdc89ef5e7c0705dd85 (patch)
tree2679945abbf2815684780921768fe54dc5280613
parent3ebb06f2c11bc48db7c10a20b4ddcaea213c6c0d (diff)
downloaddrakx-3a5fd47e26a3f597e8dc5cdc89ef5e7c0705dd85.tar
drakx-3a5fd47e26a3f597e8dc5cdc89ef5e7c0705dd85.tar.gz
drakx-3a5fd47e26a3f597e8dc5cdc89ef5e7c0705dd85.tar.bz2
drakx-3a5fd47e26a3f597e8dc5cdc89ef5e7c0705dd85.tar.xz
drakx-3a5fd47e26a3f597e8dc5cdc89ef5e7c0705dd85.zip
updated with newer perl-URPM
-rw-r--r--perl-install/pkgs.pm10
1 files changed, 5 insertions, 5 deletions
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 {