summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--urpm/download.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b41a75d9..e6f47105 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
- drop translated man pages (they are too old)
+- urpmi.addmedia:
+ o enhance parsing of urls with login:password for logins with "@"
+ so that password doesn't end up in urpmi.cfg
Version 4.10.17 - 30 November 2007, by Pascal "Pixel" Rigaux
diff --git a/urpm/download.pm b/urpm/download.pm
index 9766ded8..d368ab4e 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -628,7 +628,7 @@ sub requested_ftp_http_downloader {
sub parse_url_with_login {
my ($url) = @_;
- $url =~ m!([^:]*)://([^/:\@]*)(:([^/:\@]*))?\@([^/]*)(.*)! && $1 ne 'ssh' &&
+ $url =~ m!([^:]*)://([^/:]*)(:([^/:\@]*))?\@([^/]*)(.*)! && $1 ne 'ssh' &&
{ proto => $1, login => $2, password => $4, machine => $5, dir => $6 };
}
sub url_obscuring_password {