diff options
| -rw-r--r-- | urpm.pm | 14 | ||||
| -rw-r--r-- | urpm/README.ka-run | 15 | ||||
| -rw-r--r-- | urpm/README.ssh | 15 | ||||
| -rw-r--r-- | urpmi.spec | 8 |
4 files changed, 44 insertions, 8 deletions
@@ -705,7 +705,7 @@ sub add_distrib_media { if (-e $hdlists_file) { unlink "$urpm->{cachedir}/partial/hdlists"; $urpm->{log}(_("copying hdlists file...")); - system("cp", "-a", $hdlists_file, "$urpm->{cachedir}/partial/hdlists") ? + system("cp", "-pR", $hdlists_file, "$urpm->{cachedir}/partial/hdlists") ? $urpm->{log}(_("...copying failed")) : $urpm->{log}(_("...copying done")); } else { $urpm->{error}(_("unable to access first installation medium (no Mandrake/base/hdlists file found)")), return; @@ -921,7 +921,7 @@ sub update_media { unlink "$urpm->{statedir}/descriptions.$medium->{name}"; if (-e "$dir/../descriptions") { $urpm->{log}(_("copying description file of \"%s\"...", $medium->{name})); - system("cp", "-a", "$dir/../descriptions", "$urpm->{statedir}/descriptions.$medium->{name}") ? + system("cp", "-pR", "$dir/../descriptions", "$urpm->{statedir}/descriptions.$medium->{name}") ? $urpm->{log}(_("...copying failed")) : $urpm->{log}(_("...copying done")); } @@ -929,7 +929,7 @@ sub update_media { if ($options{force} < 2 && $medium->{with_hdlist} && -e $with_hdlist_dir) { unlink "$urpm->{cachedir}/partial/$medium->{hdlist}"; $urpm->{log}(_("copying source hdlist (or synthesis) of \"%s\"...", $medium->{name})); - system("cp", "-a", "$with_hdlist_dir", "$urpm->{cachedir}/partial/$medium->{hdlist}") ? + system("cp", "-pR", "$with_hdlist_dir", "$urpm->{cachedir}/partial/$medium->{hdlist}") ? $urpm->{log}(_("...copying failed")) : $urpm->{log}(_("...copying done")); -s "$urpm->{cachedir}/partial/$medium->{hdlist}" > 32 or @@ -962,7 +962,7 @@ sub update_media { my $local_list = $medium->{with_hdlist} =~ /hd(list.*)\.cz$/ ? $1 : 'list'; if (-s "$dir/$local_list") { $urpm->{log}(_("copying source list of \"%s\"...", $medium->{name})); - system("cp", "-a", "$dir/$local_list", "$urpm->{cachedir}/partial/list") ? + system("cp", "-pR", "$dir/$local_list", "$urpm->{cachedir}/partial/list") ? $urpm->{log}(_("...copying failed")) : $urpm->{log}(_("...copying done")); } } @@ -1056,10 +1056,10 @@ sub update_media { unlink "$urpm->{cachedir}/partial/$basename"; if ($medium->{synthesis}) { $options{force} || ! -e "$urpm->{statedir}/synthesis.$medium->{hdlist}" or - system("cp", "-a", "$urpm->{statedir}/synthesis.$medium->{hdlist}", "$urpm->{cachedir}/partial/$basename"); + system("cp", "-pR", "$urpm->{statedir}/synthesis.$medium->{hdlist}", "$urpm->{cachedir}/partial/$basename"); } else { $options{force} || ! -e "$urpm->{statedir}/$medium->{hdlist}" or - system("cp", "-a", "$urpm->{statedir}/$medium->{hdlist}", "$urpm->{cachedir}/partial/$basename"); + system("cp", "-pR", "$urpm->{statedir}/$medium->{hdlist}", "$urpm->{cachedir}/partial/$basename"); } eval { $urpm->{sync}({ dir => "$urpm->{cachedir}/partial", quiet => 0, proxy => $urpm->{proxy}}, reduce_pathname("$medium->{url}/$medium->{with_hdlist}")); @@ -1864,7 +1864,7 @@ sub download_source_packages { } } if (@removable_sources) { - system("cp", "-a", @removable_sources, "$urpm->{cachedir}/rpms"); + system("cp", "-pR", @removable_sources, "$urpm->{cachedir}/rpms"); } } else { $urpm->{error}(_("medium \"%s\" is not selected", $medium->{name})); diff --git a/urpm/README.ka-run b/urpm/README.ka-run new file mode 100644 index 00000000..02b75714 --- /dev/null +++ b/urpm/README.ka-run @@ -0,0 +1,15 @@ +This extension module allow to use ka-run package to perform distributed copy +of package over network. + +To use this module, edit /etc/urpmi/parallel.cfg and add an alias line as +follow : + <name>:ka-run:<ka-run tools command line options> +or + <name>:ka-run(<default media>):<ka-run tools command line options> +where <name> is alias name parameter of --parallel options of urpmi, + <default media> is default --media parameter for this alias, + <ka-run tools command line options> is options which will be given to + rshp and mput command, for example "-c ssh -m node1 -m node2 ... -m + nodeN". + +For any more information, please send mail to <fpons@mandrakesoft.com>. diff --git a/urpm/README.ssh b/urpm/README.ssh new file mode 100644 index 00000000..774c63c5 --- /dev/null +++ b/urpm/README.ssh @@ -0,0 +1,15 @@ +This extension module allow to use ssh package to perform distributed copy +of package over network. This is more a sample module which is somewhat slow +to run distant script. + +To use this module, edit /etc/urpmi/parallel.cfg and add an alias line as +follow : + <name>:ssh:<node list separated by ':'> +or + <name>:ssh(<default media>):<node list separated by ':'> +where <name> is alias name parameter of --parallel options of urpmi, + <default media> is default --media parameter for this alias, + <node list separated by ':'> is list of node, for example "node1:node2: + ...:nodeN". + +For any more information, please send mail to <fpons@mandrakesoft.com>. @@ -2,7 +2,7 @@ Name: urpmi Version: 4.0 -Release: 20mdk +Release: 21mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -194,14 +194,20 @@ fi %files -n urpmi-parallel-ka-run %defattr(-,root,root) +%doc urpm/README.ka-run %{perl_vendorlib}/urpm/parallel_ka_run.pm %files -n urpmi-parallel-ssh %defattr(-,root,root) +%doc urpm/README.ssh %{perl_vendorlib}/urpm/parallel_ssh.pm %changelog +* Mon Sep 23 2002 François Pons <fpons@mandrakesoft.com> 4.0-21mdk +- fixed bad copy of files when a relative symlink is used. +- added minimal README documentation files for distributed modules. + * Tue Sep 17 2002 François Pons <fpons@mandrakesoft.com> 4.0-20mdk - gc: fixed curl proxy management. |