diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-14 13:13:36 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-14 13:13:36 +0000 |
| commit | 6c979a1c4e12979a5f3f1182c3ad0734386a6c94 (patch) | |
| tree | 443936ad1c8112604c88d30451441dacc1aec27e | |
| parent | 872a3e8c4abd332d6c1a9339cef2de54099ccee7 (diff) | |
| download | drakx-backup-do-not-use-6c979a1c4e12979a5f3f1182c3ad0734386a6c94.tar drakx-backup-do-not-use-6c979a1c4e12979a5f3f1182c3ad0734386a6c94.tar.gz drakx-backup-do-not-use-6c979a1c4e12979a5f3f1182c3ad0734386a6c94.tar.bz2 drakx-backup-do-not-use-6c979a1c4e12979a5f3f1182c3ad0734386a6c94.tar.xz drakx-backup-do-not-use-6c979a1c4e12979a5f3f1182c3ad0734386a6c94.zip | |
selectPackage:
- stop reporting false errors
- much nicer error message
| -rw-r--r-- | perl-install/install/pkgs.pm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index 80aa95b92..b7414f8b2 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -268,10 +268,8 @@ sub selectPackage { my @l = $packages->resolve_requested($packages->{rpmdb}, $state, packageRequest($packages, $pkg) || {}, callback_choices => \&packageCallbackChoices); - if (!member($pkg, @l) && $state->{rejected}) { - log::l("ERROR: selecting " . $pkg->name . " failed"); - require Data::Dumper; - log::l(Data::Dumper::Dumper($state->{rejected})); + if (!exists $state->{selected}{$pkg->id}) { + log::l("ERROR: selecting " . $pkg->name . " failed: " . urpm::select::translate_why_unselected_one($packages, $state, scalar $pkg->fullname)); } if ($b_base) { |