no_comment

6 files changed, 13 insertions, 10 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index 6c2704d0b..b9d66b7a1 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -70,7 +70,7 @@ gendepslist: %: %.cc
 	$(CXX) -I/usr/include/rpm $(CFLAGS) $< -lrpm -ldb1 -lz -o $@
 
 $(BASE)/depslist: gendepslist $(RPMS) 
-	./gendepslist $(BASE)depslist $(ROOTDEST)/Mandrake/RPMS/*.rpm
+	./gendepslist $(BASE)/depslist $(ROOTDEST)/Mandrake/RPMS/*.rpm
 
 install_pms: all
 	for i in `perl -ne 's/sub (\w+?)_? {.*/$$1/ and print' commands.pm`; do ln -sf commands $(DEST)/usr/bin/$$i; done
@@ -178,7 +178,7 @@ stage2:
 	rm $(STAGE2TMP)/usr/X11R6/bin/XF86_SVGA
 	for i in /usr/share/locale /usr/share/keymaps /usr/share/xmodmap; do \
 		name=`basename $$i` ; \
-		(cd $(STAGE2TMP)/`dirname $$i` ; find $$name | cpio --quiet -o 2>/dev/null | bzip2 > $$name.cpio.bz2 ; rm -rf $$name) \
+		(cd $(STAGE2TMP)/$$i ; find * | cpio --quiet -o 2>/dev/null | bzip2 > ../$$name.cpio.bz2 ; rm -rf $$name) \
 	done
 	$(SUDO) cp -a $(STAGE2TMP)/* /mnt/stage2
 	$(SUDO) rm -rf $(STAGE2TMP)
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 5b6f79e41..fd98b409a 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -31,9 +31,7 @@ sub get {
 sub hds() { grep { $_->{type} eq 'hd' } get(); }
 sub cdroms() { grep { $_->{type} eq 'cdrom' } get(); }
 sub floppies() {
-    (grep { 
-	my $fd = tryOpen($_);
-    } qw(fd0 fd1)),
+    (grep { tryOpen($_) } qw(fd0 fd1)),
     (grep { $_->{type} eq 'fd' } get());
 }
 
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 47d4808a4..2386619b8 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -131,12 +131,12 @@ sub addToBeDone(&$) {
 sub install_cpio {
     my ($dir, $name) = @_;
 
-    return if -e "$dir/$name";
+    return "$dir/$name" if -e "$dir/$name";
 
     my $cpio = "$dir.cpio.bz2";
     -e $cpio or return;
 
-    commands::rm "-r", $dir;
+    eval { commands::rm "-r", $dir };
     mkdir $dir, 0755;
     run_program::run("cd $dir ; bzip2 -cd $cpio | cpio -i $name");
     "$dir/$name";
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index a3a1c96c6..77d9bbb86 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -121,7 +121,7 @@ sub set {
 	delete $ENV{LC_ALL};
 	delete $ENV{LINGUAS};
     }
-    install_any::install_cpio($prefix, "/usr/share/locale", $lang);
+    install_any::install_cpio("/usr/share/locale", $lang);
 }
 
 sub write {
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 7c859cb08..18f1693be 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -218,7 +218,7 @@ sub setSelectedFromCompssList($$$$$) {
 	defined $ind or log::l("unknown install class $install_class in compssList"), return;
 
 	my @values = map { $_->{values}[$ind] } @packages;
-	sort { $values[$a] <=> $values[$b] } 0 .. $#packages;
+	sort { $values[$b] <=> $values[$a] } 0 .. $#packages;
     };
     foreach (@places) {
 	my $p = $packages[$_];
diff --git a/perl-install/share/list b/perl-install/share/list
index 46d6ecf08..beffbce8f 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -11,6 +11,7 @@
 /usr/bin/bzip2
 /usr/lib/gconv/gconv-modules
 /usr/lib/gconv/ISO8859-1.so
+/usr/lib/gconv/ISO8859-9.so
 /usr/lib/perl5/5.00503/AutoLoader.pm
 /usr/lib/perl5/5.00503/Carp.pm
 /usr/lib/perl5/5.00503/Data/Dumper.pm
@@ -66,8 +67,8 @@
 /usr/X11R6/bin/xmodmap
 /usr/X11R6/lib/X11/fonts/75dpi/fonts.dir
 /usr/X11R6/lib/X11/fonts/75dpi/fonts.alias
-/usr/X11R6/lib/X11/fonts/75dpi/helvR10.pcf.gz
 /usr/X11R6/lib/X11/fonts/75dpi/helvR08.pcf.gz
+/usr/X11R6/lib/X11/fonts/75dpi/helvR10.pcf.gz
 /usr/X11R6/lib/X11/fonts/cyrillic/fonts.dir
 /usr/X11R6/lib/X11/fonts/cyrillic/fonts.alias
 /usr/X11R6/lib/X11/fonts/cyrillic/crox1h.pcf.gz
@@ -78,3 +79,7 @@
 /usr/X11R6/lib/X11/fonts/misc/cursor.pcf.gz
 /usr/X11R6/lib/X11/fonts/misc/jiskan16.pcf.gz
 /usr/X11R6/lib/X11/fonts/misc/7x14rk.pcf.gz
+/usr/share/fonts/ISO8859-9/75dpi/fonts.dir
+/usr/share/fonts/ISO8859-9/75dpi/fonts.alias
+/usr/share/fonts/ISO8859-9/75dpi/tr_helvR08.pcf.gz
+/usr/share/fonts/ISO8859-9/75dpi/tr_helvR10.pcf.gz