diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-12-05 15:31:18 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-12-05 15:31:18 +0000 |
| commit | a9def5f61d5a49e5f148951af4e422c446b57c84 (patch) | |
| tree | 05ebd0d56a5255f27020b2cb97e8123645d6db7c | |
| parent | 29989153a3f490d06955a4d109610a779234b798 (diff) | |
| download | urpmi-a9def5f61d5a49e5f148951af4e422c446b57c84.tar urpmi-a9def5f61d5a49e5f148951af4e422c446b57c84.tar.gz urpmi-a9def5f61d5a49e5f148951af4e422c446b57c84.tar.bz2 urpmi-a9def5f61d5a49e5f148951af4e422c446b57c84.tar.xz urpmi-a9def5f61d5a49e5f148951af4e422c446b57c84.zip | |
- urpmi.addmedia:
o enhance parsing of urls with login:password for logins with "@"
so that password doesn't end up in urpmi.cfg
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | urpm/download.pm | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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 { |