diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-08 18:05:48 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-08 18:05:48 +0000 |
commit | 646de7067306de16958f9248b4f01ca730ca5c52 (patch) | |
tree | 14b98233c1ecccd6b5b21e82d62c8f4f3a6fea12 /urpm/install.pm | |
parent | ec49bc330577f2b7535ad658ab0608ecace5a9a2 (diff) | |
download | urpmi-646de7067306de16958f9248b4f01ca730ca5c52.tar urpmi-646de7067306de16958f9248b4f01ca730ca5c52.tar.gz urpmi-646de7067306de16958f9248b4f01ca730ca5c52.tar.bz2 urpmi-646de7067306de16958f9248b4f01ca730ca5c52.tar.xz urpmi-646de7067306de16958f9248b4f01ca730ca5c52.zip |
goal: get rid of $list which must be used together with $urpm->{media}, and use $blists instead
- create urpm::get_pkgs::selected2local_and_blists(),
which is similar to selected2list(), but returns a $blists
- the following functions have been modified to use a $blists instead of $list:
urpm::cdrom::copy_packages_of_removable_media()
urpm::install::prepare_transaction()
urpm::removable::try_mounting_non_cdroms()
urpm::get_pkgs::download_packages_of_distant_media()
- adapt code to use $blists
Diffstat (limited to 'urpm/install.pm')
-rw-r--r-- | urpm/install.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/urpm/install.pm b/urpm/install.pm index db15ae09..0df11dce 100644 --- a/urpm/install.pm +++ b/urpm/install.pm @@ -27,13 +27,13 @@ sub _hash_intersect_list { } sub prepare_transaction { - my ($_urpm, $set, $list, $sources) = @_; + my ($_urpm, $set, $blists, $sources) = @_; - my @transaction_list = map { - _hash_intersect_list($_, $set->{upgrade}); - } @$list; + my @blists_subset = map { + +{ %$_, list => _hash_intersect_list($_->{list}, $set->{upgrade}) }; + } @$blists; - \@transaction_list, _hash_intersect_list($sources, $set->{upgrade}); + \@blists_subset, _hash_intersect_list($sources, $set->{upgrade}); } sub build_transaction_set_ { |