summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-08 16:20:09 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-08 16:20:09 +0000
commit54501679f0a96f476c21cfdf4a95698f09f6e183 (patch)
tree400886bfdf96256a007161b28c0f11bbd41f010a /perl-install/install_any.pm
parent99fefadac5995e9c23dc41102ebc4cb15c418ec1 (diff)
downloaddrakx-54501679f0a96f476c21cfdf4a95698f09f6e183.tar
drakx-54501679f0a96f476c21cfdf4a95698f09f6e183.tar.gz
drakx-54501679f0a96f476c21cfdf4a95698f09f6e183.tar.bz2
drakx-54501679f0a96f476c21cfdf4a95698f09f6e183.tar.xz
drakx-54501679f0a96f476c21cfdf4a95698f09f6e183.zip
advertising modifs
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm27
1 files changed, 25 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index b7dc23972..3686893b8 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -3,7 +3,7 @@ package install_any; # $Id$
use diagnostics;
use strict;
-use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @needToCopy @needToCopyIfRequiresSatisfied $boot_medium);
+use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @needToCopy @needToCopyIfRequiresSatisfied $boot_medium @advertising_images);
@ISA = qw(Exporter);
%EXPORT_TAGS = (
@@ -92,7 +92,7 @@ sub errorOpeningFile($) {
$current_medium = $asked_medium;
eval { fs::mount($cdrom, "/tmp/image", "iso9660", 'readonly') };
my $getFile = getFile($file);
- $getFile and $::o->copy_advertising;
+ $getFile && @advertising_images and copy_advertising($::o);
$getFile and return $getFile;
$current_medium = 'unknown'; #- don't know what CD is inserted now.
ejectCdrom($cdrom);
@@ -760,5 +760,28 @@ sub log_sizes {
formatXiB(sum(`rpm --root $o->{prefix}/ -qa --queryformat "%{size}\n"`))) if -x "$o->{prefix}/bin/rpm";
}
+sub copy_advertising {
+ my ($o) = @_;
+
+ return if $::rootwidth < 800;
+
+ my $f = getFile('Mandrake/share/advertising/list');
+ if (my @files = <$f>) {
+ my $dir = "$o->{prefix}/tmp/drakx-images";
+ mkdir $dir;
+ unlink glob_("$dir/*");
+ foreach (@files) {
+ chomp;
+ getAndSaveFile("Mandrake/share/advertising/$_", "$dir/$_");
+ }
+ @advertising_images = map { "$dir/$_" } @files;
+ }
+}
+sub remove_advertising {
+ my ($o) = @_;
+ unlink @advertising_images;
+ rmdir "$o->{prefix}/tmp/drakx-images";
+ @advertising_images = ();
+}
1;