From 2d85f131e1ec9181038692493bb9daca277edb45 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 21 Dec 2004 12:40:06 +0000
Subject: don't pass prefix, use $::prefix

---
 perl-install/any.pm                    | 28 ++++++++++++++--------------
 perl-install/commands                  |  1 +
 perl-install/commands.pm               |  2 +-
 perl-install/install_any.pm            |  5 ++---
 perl-install/install_steps.pm          |  2 +-
 perl-install/standalone/drakbug_report |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 5c68f84f8..9eed58f0d 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -815,7 +815,7 @@ sub set_login_serial_console {
 }
 
 sub report_bug {
-    my ($prefix, @other) = @_;
+    my (@other) = @_;
 
     sub header { "
 ********************************************************************************
@@ -832,23 +832,23 @@ sub report_bug {
       header("/sys/bus/scsi/devices"), `ls -l /sys/bus/scsi/devices`,
       header("lsmod"), cat_("/proc/modules"),
       header("cmdline"), cat_("/proc/cmdline"),
-      header("pcmcia: stab"), cat_("$prefix/var/lib/pcmcia/stab") || cat_("$prefix/var/run/stab"),
+      header("pcmcia: stab"), cat_("$::prefix/var/lib/pcmcia/stab") || cat_("$::prefix/var/run/stab"),
       header("usb"), cat_("/proc/bus/usb/devices"),
       header("partitions"), cat_("/proc/partitions"),
       header("cpuinfo"), cat_("/proc/cpuinfo"),
-      header("syslog"), cat_("/tmp/syslog") || cat_("$prefix/var/log/syslog"),
+      header("syslog"), cat_("/tmp/syslog") || cat_("$::prefix/var/log/syslog"),
       header("ddcxinfos"), ddcxinfos(),
-      header("stage1.log"), cat_("/tmp/stage1.log") || cat_("$prefix/root/drakx/stage1.log"),
-      header("ddebug.log"), cat_("/tmp/ddebug.log") || cat_("$prefix/root/drakx/ddebug.log"),
-      header("install.log"), cat_("$prefix/root/drakx/install.log"),
-      header("fstab"), cat_("$prefix/etc/fstab"),
-      header("modules.conf"), cat_("$prefix/etc/modules.conf"),
-      header("lilo.conf"), cat_("$prefix/etc/lilo.conf"),
-      header("menu.lst"), cat_("$prefix/boot/grub/menu.lst"),
-      header("XF86Config"), cat_("$prefix/etc/X11/XF86Config"),
-      header("XF86Config-4"), cat_("$prefix/etc/X11/XF86Config-4"),
-      header("/etc/modules"), cat_("$prefix/etc/modules"),
-      header("sysconfig/i18n"), cat_("$prefix/etc/sysconfig/i18n"),
+      header("stage1.log"), cat_("/tmp/stage1.log") || cat_("$::prefix/root/drakx/stage1.log"),
+      header("ddebug.log"), cat_("/tmp/ddebug.log") || cat_("$::prefix/root/drakx/ddebug.log"),
+      header("install.log"), cat_("$::prefix/root/drakx/install.log"),
+      header("fstab"), cat_("$::prefix/etc/fstab"),
+      header("modules.conf"), cat_("$::prefix/etc/modules.conf"),
+      header("lilo.conf"), cat_("$::prefix/etc/lilo.conf"),
+      header("menu.lst"), cat_("$::prefix/boot/grub/menu.lst"),
+      header("XF86Config"), cat_("$::prefix/etc/X11/XF86Config"),
+      header("XF86Config-4"), cat_("$::prefix/etc/X11/XF86Config-4"),
+      header("/etc/modules"), cat_("$::prefix/etc/modules"),
+      header("sysconfig/i18n"), cat_("$::prefix/etc/sysconfig/i18n"),
       map_index { even($::i) ? header($_) : $_ } @other;
 }
 
diff --git a/perl-install/commands b/perl-install/commands
index 294ab290a..f08fbb95c 100755
--- a/perl-install/commands
+++ b/perl-install/commands
@@ -8,6 +8,7 @@ use common;
 use commands;
 
 $::isInstall = 1;
+$::prefix = '/mnt';
 my $progname = basename($0);
 
 eval {
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index dd7bc1ab5..d5e2fedab 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -481,7 +481,7 @@ sub bug {
     mount devices::make(detect_devices::floppy()), "/fd0";
 
     require install_any;
-    output("/fd0/report.bug", install_any::report_bug("/mnt")); #- no other way :-(
+    output("/fd0/report.bug", install_any::report_bug());
     umount "/fd0";
     common::sync();
 }
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 7c9e1bcb2..b50c1be2e 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -989,9 +989,8 @@ sub kdemove_desktop_file {
 #-###############################################################################
 sub auto_inst_file() { "$::prefix/root/drakx/auto_inst.cfg.pl" }
 
-sub report_bug {
-    my ($prefix) = @_;
-    any::report_bug($prefix, 'auto_inst' => g_auto_install('', 1));
+sub report_bug() {
+    any::report_bug('auto_inst' => g_auto_install('', 1));
 }
 
 sub g_auto_install {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 338c3f420..4c96011d7 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -930,7 +930,7 @@ sub exitInstall {
     eval { 
 	my $report = '/root/drakx/report.bug';
 	unlink "$::prefix$report", "$::prefix$report.gz";
-	output "$::prefix$report", install_any::report_bug($o->{prefix});
+	output "$::prefix$report", install_any::report_bug();
 	run_program::rooted($::prefix, 'gzip', $report);
     };
     install_any::getAndSaveAutoInstallFloppies($o, 1) if arch() !~ /^ppc/;
diff --git a/perl-install/standalone/drakbug_report b/perl-install/standalone/drakbug_report
index 632dafcf7..d40d5a1c4 100755
--- a/perl-install/standalone/drakbug_report
+++ b/perl-install/standalone/drakbug_report
@@ -12,4 +12,4 @@ my %other = (
     'df' => join('', `df`),
 );
 
-print any::report_bug('', %other);
+print any::report_bug(%other);
-- 
cgit v1.2.1