diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-09-15 13:39:50 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-09-15 13:39:50 +0000 |
| commit | ca56c01452ed58112ec1811c0d27dd526f6260e7 (patch) | |
| tree | af5d2bf7581f841f766eb5cca7951d0e4a4e5229 | |
| parent | 8d4516ae4290aeb3855804b1c74f4ae6fefe903e (diff) | |
| download | drakx-ca56c01452ed58112ec1811c0d27dd526f6260e7.tar drakx-ca56c01452ed58112ec1811c0d27dd526f6260e7.tar.gz drakx-ca56c01452ed58112ec1811c0d27dd526f6260e7.tar.bz2 drakx-ca56c01452ed58112ec1811c0d27dd526f6260e7.tar.xz drakx-ca56c01452ed58112ec1811c0d27dd526f6260e7.zip | |
no_comment
| -rw-r--r-- | perl-install/install2.pm | 6 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 3 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 098b6a1fd..cd45e7763 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -414,7 +414,6 @@ I'll try to go on blanking bad partitions")); } -#-PADTODO sub formatPartitions { $o->choosePartitionsToFormat($o->{fstab}); @@ -427,15 +426,12 @@ sub formatPartitions { } #------------------------------------------------------------------------------ -#-PADTODO sub choosePackages { - install_any::setPackages($o, \@install_classes); - $o->choosePackages($o->{packages}, $o->{compss}); + $o->choosePackages($o->{packages}, $o->{compss}, \@install_classes); $o->{packages}{$_}{selected} = 1 foreach @{$o->{base}}; } #------------------------------------------------------------------------------ -#-PADTODO sub doInstallStep { $o->beforeInstallPackages; $o->installPackages($o->{packages}); diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 2ebb6e868..6485aa759 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -38,7 +38,8 @@ sub getFile($) { *install_any::getFile = \&ftp::getFile; } else { *install_any::getFile = sub($) { - open getFile, "/tmp/rhimage/" . relGetFile($_[0]) or return; + print ">>>>>> /tmp/rhimage/" . relGetFile($_[0]), "\n"; + open getFile, "/tmp/rhimage/" . relGetFile($_[0]) or sleep(1000), return; \*getFile; }; } diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 4736a98c9..09756f199 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -128,7 +128,8 @@ sub formatPartitions { #------------------------------------------------------------------------------ sub choosePackages($$$) { - my ($o, $packages, $compss) = @_; + my ($o, $packages, $compss, $install_classes) = @_; + install_any::setPackages($o, $install_classes); } sub beforeInstallPackages { |