From 95cf05b26301aeae1667fdb5ec37885a12da2c05 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 24 Mar 2001 11:04:26 +0000
Subject: (copy_advertising): handle i18n'ed advertising

---
 perl-install/install_any.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'perl-install/install_any.pm')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index b07038609..fce228234 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -788,14 +788,18 @@ sub copy_advertising {
 
     return if $::rootwidth < 800;
 
-    my $f = getFile('Mandrake/share/advertising/list');
+    my $source_dir = "Mandrake/share/advertising";
+    foreach ("." . $o->{lang}, "." . substr($o->{lang},0,2), '') {
+	$f = getFile("$source_dir$_/list") or next;
+	$source_dir = "$source_dir$_";
+    }
     if (my @files = <$f>) {
 	my $dir = "$o->{prefix}/tmp/drakx-images";
 	mkdir $dir;
 	unlink glob_("$dir/*");
 	foreach (@files) {
 	    chomp;
-	    getAndSaveFile("Mandrake/share/advertising/$_", "$dir/$_");
+	    getAndSaveFile("$source_dir/$_", "$dir/$_");
 	}
 	@advertising_images = map { "$dir/$_" } @files;
     }
-- 
cgit v1.2.1