From a9def5f61d5a49e5f148951af4e422c446b57c84 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 5 Dec 2007 15:31:18 +0000
Subject: - urpmi.addmedia:   o enhance parsing of urls with login:password for
 logins with "@"     so that password doesn't end up in urpmi.cfg

---
 NEWS             | 3 +++
 urpm/download.pm | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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 {
-- 
cgit v1.2.1