summaryrefslogtreecommitdiffstats
path: root/perl-install/do_pkgs.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-12 13:51:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-12 13:51:42 +0000
commit0ab7ebe78a682d07010cd2242748c57346cca480 (patch)
treeb6f016a69016f57047cc5ab44ba0766384e11410 /perl-install/do_pkgs.pm
parent08118de09b6b4c23db243e6eabef4236dcb213cc (diff)
downloaddrakx-0ab7ebe78a682d07010cd2242748c57346cca480.tar
drakx-0ab7ebe78a682d07010cd2242748c57346cca480.tar.gz
drakx-0ab7ebe78a682d07010cd2242748c57346cca480.tar.bz2
drakx-0ab7ebe78a682d07010cd2242748c57346cca480.tar.xz
drakx-0ab7ebe78a682d07010cd2242748c57346cca480.zip
- install_steps_auto_install is not a interactive but still needs do_pkgs
- so making do_pkgs a class, and interactive and install_steps will inheritate from it - do_pkgs renamed into do_pkgs_common, containing the things common to do_pkgs_during_install and do_pkgs_standalone
Diffstat (limited to 'perl-install/do_pkgs.pm')
-rw-r--r--perl-install/do_pkgs.pm17
1 files changed, 10 insertions, 7 deletions
diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm
index baf96b7f0..bbcacb620 100644
--- a/perl-install/do_pkgs.pm
+++ b/perl-install/do_pkgs.pm
@@ -1,4 +1,12 @@
package do_pkgs; # $Id$
+
+sub do_pkgs {
+ my ($in) = @_;
+ ($::isInstall ? 'do_pkgs_during_install' : 'do_pkgs_standalone')->new($in);
+}
+
+################################################################################
+package do_pkgs_common;
use common;
sub new {
@@ -6,11 +14,6 @@ sub new {
bless { in => $in }, $type;
}
-sub vnew {
- my ($_type, $in) = @_;
- ($::isInstall ? 'do_pkgs_during_install' : 'do_pkgs_standalone')->new($in);
-}
-
sub ensure_is_installed {
my ($do, $pkg, $file, $b_auto) = @_;
@@ -36,7 +39,7 @@ package do_pkgs_during_install;
use run_program;
use common;
-our @ISA = qw(do_pkgs);
+our @ISA = qw(do_pkgs_common);
sub new {
my ($type, $in) = @_;
@@ -118,7 +121,7 @@ use run_program;
use common;
use log;
-our @ISA = qw(do_pkgs);
+our @ISA = qw(do_pkgs_common);
sub install {
my ($do, @l) = @_;