diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-10 11:54:55 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-10 11:54:55 +0000 |
commit | 9e6bea7b5cf1f72ff6b539e2ab05d82399e2e721 (patch) | |
tree | 55a9b15a03182d91781b49aaef92437952c02694 /urpm | |
parent | d55f38a649ddd2fddc9cd1a4634b2bacd0d61c32 (diff) | |
download | urpmi-9e6bea7b5cf1f72ff6b539e2ab05d82399e2e721.tar urpmi-9e6bea7b5cf1f72ff6b539e2ab05d82399e2e721.tar.gz urpmi-9e6bea7b5cf1f72ff6b539e2ab05d82399e2e721.tar.bz2 urpmi-9e6bea7b5cf1f72ff6b539e2ab05d82399e2e721.tar.xz urpmi-9e6bea7b5cf1f72ff6b539e2ab05d82399e2e721.zip |
move parallel_register_rpms() to parallel (ie avoid duplication)
Diffstat (limited to 'urpm')
-rw-r--r-- | urpm/parallel.pm | 8 | ||||
-rw-r--r-- | urpm/parallel_ka_run.pm | 9 | ||||
-rw-r--r-- | urpm/parallel_ssh.pm | 8 |
3 files changed, 8 insertions, 17 deletions
diff --git a/urpm/parallel.pm b/urpm/parallel.pm index 0b6edba5..0feed52c 100644 --- a/urpm/parallel.pm +++ b/urpm/parallel.pm @@ -104,6 +104,14 @@ sub parallel_find_remove { keys %{$state->{rejected}}; } + +#- parallel copy +sub parallel_register_rpms { + my ($parallel, $urpm, @files) = @_; + + copy_to_dir($parallel, $urpm, @files, "$urpm->{cachedir}/rpms"); + urpm::parallel::post_register_rpms($parallel, $urpm, @files); +} sub post_register_rpms { my ($parallel, $urpm, @files) = @_; diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index ca3a86a4..d915e8c4 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -65,15 +65,6 @@ sub _run_mput { $? == 0 || $? == 256 or $urpm->{fatal}(1, N("mput failed, maybe a node is unreacheable")); } -#- parallel copy -sub parallel_register_rpms { - my ($parallel, $urpm, @files) = @_; - - copy_to_dir($parallel, $urpm, @files, "$urpm->{cachedir}/rpms/"); - - urpm::parallel::post_register_rpms($parallel, $urpm, @files); -} - #- parallel resolve_dependencies sub parallel_resolve_dependencies { my ($parallel, $synthesis, $urpm, $state, $requested, %options) = @_; diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm index 4c2f7ab1..1c416f2b 100644 --- a/urpm/parallel_ssh.pm +++ b/urpm/parallel_ssh.pm @@ -74,14 +74,6 @@ sub urpm_popen { } } -#- parallel copy -sub parallel_register_rpms { - my ($parallel, $urpm, @files) = @_; - - copy_to_dir($parallel, $urpm, @files, "$urpm->{cachedir}/rpms"); - urpm::parallel::post_register_rpms($parallel, $urpm, @files); -} - #- parallel resolve_dependencies sub parallel_resolve_dependencies { my ($parallel, $synthesis, $urpm, $state, $requested, %options) = @_; |