summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-12-04 10:16:44 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-12-04 10:16:44 +0000
commitd911fb62181f1f8b6bf2ca500b8838410615055b (patch)
tree12888594f118c18b82971491be5fca49f6ace92e /perl-install/install_any.pm
parent0e0508a31a6fb1a928a601afef41d5f465a8a019 (diff)
downloaddrakx-d911fb62181f1f8b6bf2ca500b8838410615055b.tar
drakx-d911fb62181f1f8b6bf2ca500b8838410615055b.tar.gz
drakx-d911fb62181f1f8b6bf2ca500b8838410615055b.tar.bz2
drakx-d911fb62181f1f8b6bf2ca500b8838410615055b.tar.xz
drakx-d911fb62181f1f8b6bf2ca500b8838410615055b.zip
- use do_pkgs->ensure_is_installed instead of do_pkgs->install where it's easy to do so
- do_pkgs->install won't do anything when $::testing we need a ensure_are_installed we also need to share more package pkgs_interactive code which is hosted in install_any and standalone
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index bfb568b2f..607659ef8 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1123,7 +1123,12 @@ sub install_steps::do_pkgs {
sub install {
my ($do, @l) = @_;
- $do->{o}->pkg_install(@l);
+ if ($::testing) {
+ log::l("i would install packages " . join(' ', @l));
+ return 1;
+ } else {
+ $do->{o}->pkg_install(@l);
+ }
}
sub ensure_is_installed {