aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xrpmdrake4
-rw-r--r--rpmdrake.spec1
2 files changed, 4 insertions, 1 deletions
diff --git a/rpmdrake b/rpmdrake
index 51383d23..5f81f0cf 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -1119,7 +1119,9 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
my $distant_number;
foreach my $l (@$list) {
foreach (sort values %$l) {
- standalone::explanations("Installing package $_");
+ my $showable = $_;
+ $showable =~ s|([^:]*://[^/:\@]*:)[^/:\@]*(\@.*)|$1xxxx$2|; #- hide password
+ standalone::explanations("Installing package $showable");
/^file|removable/ or $distant_number++;
}
}
diff --git a/rpmdrake.spec b/rpmdrake.spec
index 99b99f8c..259951a6 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -120,6 +120,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Feb 19 2004 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1.2-6mdk
- edit-urpm-media: fix broken media reordering (program crashed)
+- rpmdrake: hide password in logs (#6260)
* Fri Feb 13 2004 Thierry Vignaud <tvignaud@mandrakesoft.com> 2.1.2-5mdk
- make it embeddable