diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-07-10 16:25:10 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-07-10 16:25:10 +0000 |
| commit | 1a649e4bd1f0a76ec28fcb851b2f8fe2d6d967e1 (patch) | |
| tree | 73c2e8ca7870ef0bb99753a2b1cdf8b16eb7e211 /perl-install/install_any.pm | |
| parent | 52372f1853308aa90b76d4b5cd880c595433fc1d (diff) | |
| download | drakx-backup-do-not-use-1a649e4bd1f0a76ec28fcb851b2f8fe2d6d967e1.tar drakx-backup-do-not-use-1a649e4bd1f0a76ec28fcb851b2f8fe2d6d967e1.tar.gz drakx-backup-do-not-use-1a649e4bd1f0a76ec28fcb851b2f8fe2d6d967e1.tar.bz2 drakx-backup-do-not-use-1a649e4bd1f0a76ec28fcb851b2f8fe2d6d967e1.tar.xz drakx-backup-do-not-use-1a649e4bd1f0a76ec28fcb851b2f8fe2d6d967e1.zip | |
use perl-URPM instead of rpmtools.
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 78283cf96..4e5bff38b 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -165,7 +165,7 @@ sub setup_postinstall_rpms($$) { pkgs::selectPackage($packages, $p, 0, \%toCopy); } - my @toCopy = grep { $_ && pkgs::packageFlagSelected($_) == 0 } map { pkgs::packageByName($packages, $_) } keys %toCopy; + my @toCopy = grep { $_ && !$_->flag_selected } map { pkgs::packageByName($packages, $_) } keys %toCopy; #- extract headers of package, this is necessary for getting #- the complete filename of each package. @@ -1116,7 +1116,7 @@ sub is_installed { my ($do, @l) = @_; foreach (@l) { my $p = pkgs::packageByName($do->{o}->{packages}, $_); - $p && pkgs::packageFlagSelected($p) or return; + $p && $p->flag_selected or return; } 1; } @@ -1137,7 +1137,10 @@ sub remove_nodeps { @l = grep { my $p = pkgs::packageByName($do->{o}->{packages}, $_); - pkgs::packageSetFlagSelected($p, 0) if $p; + if ($p) { + $p->set_flag_requested(0); + $p->set_flag_required(0); + } $p; } @l; run_program::rooted($do->{o}->{prefix}, 'rpm', '-e', '--nodeps', @l); |