summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-26 01:17:03 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-26 01:17:03 +0000
commit08fe0c9aa483ba4baa48c846a68f66d4d7b4bc9c (patch)
tree7c205c00263732c3c40e5777841a8275cf87d7b3
parent72773c093a93d451093804f28b28325d3ee9ce54 (diff)
downloaddrakx-08fe0c9aa483ba4baa48c846a68f66d4d7b4bc9c.tar
drakx-08fe0c9aa483ba4baa48c846a68f66d4d7b4bc9c.tar.gz
drakx-08fe0c9aa483ba4baa48c846a68f66d4d7b4bc9c.tar.bz2
drakx-08fe0c9aa483ba4baa48c846a68f66d4d7b4bc9c.tar.xz
drakx-08fe0c9aa483ba4baa48c846a68f66d4d7b4bc9c.zip
remove passwords and realnames from report.bug
-rw-r--r--perl-install/install_any.pm10
1 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 68cf34ab1..62198a707 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -622,11 +622,11 @@ sub auto_inst_file() { ($::g_auto_install ? "/tmp" : "$::o->{prefix}/root/drakx"
sub report_bug {
my ($prefix) = @_;
- any::report_bug($prefix, 'auto_inst' => g_auto_install());
+ any::report_bug($prefix, 'auto_inst' => g_auto_install('', 1));
}
sub g_auto_install {
- my ($replay) = @_;
+ my ($replay, $respect_privacy) = @_;
my $o = {};
require pkgs;
@@ -661,7 +661,11 @@ sub g_auto_install {
#- deep copy because we're modifying it below
$o->{users} = [ @{$o->{users} || []} ];
- $_ = { %{$_ || {}} }, delete @$_{qw(oldu oldg password password2)} foreach $o->{superuser}, @{$o->{users} || []};
+ my @user_info_to_remove = (
+ if_($respect_privacy, qw(name realname home pw)),
+ qw(oldu oldg password password2),
+ );
+ $_ = { %{$_ || {}} }, delete @$_{@user_info_to_remove} foreach $o->{superuser}, @{$o->{users} || []};
require Data::Dumper;
my $str = join('',