From 0ae9dd3c17c5d66a99d884d0e8bdb18566f9105c Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 17 Sep 2007 15:44:31 +0000 Subject: create _is_selected_or_installed() out of _score_for_locales() --- URPM/Resolve.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index c3ebd49..d4a9fb5 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -82,6 +82,13 @@ sub strict_arch_check { 1; } +sub _is_selected_or_installed { + my ($urpm, $db, $name) = @_; + + (grep { $_->flag_available } $urpm->packages_providing($name)) > 0 || + $db->traverse_tag('name', [ $name ], undef) > 0; +} + # deprecated function name sub find_chosen_packages { &find_required_package } @@ -222,8 +229,7 @@ sub _score_for_locales { my @r = $pkg->requires_nosense; if (my ($specific_locales) = grep { /locales-(?!en)/ } @r) { - if ((grep { $_->flag_available } $urpm->packages_providing($specific_locales)) > 0 || - $db->traverse_tag('name', [ $specific_locales ], undef) > 0) { + if (_is_selected_or_installed($urpm, $db, $specific_locales)) { 3; # good locale } else { 0; # bad locale -- cgit v1.2.1