summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--urpm/download.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index d3472e29..bd2b4c89 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
- urpmi
o enhance "columns" display of packages to install (esp. fit on 80 columns)
+ o do not use netrc for protocol ssh
Version 4.10.7 - 6 September 2007, by Pascal "Pixel" Rigaux
diff --git a/urpm/download.pm b/urpm/download.pm
index 25de2046..9b2c464d 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!([^:]*)://([^/:\@]*)(:([^/:\@]*))?\@([^/]*)(.*)! &&
+ $url =~ m!([^:]*)://([^/:\@]*)(:([^/:\@]*))?\@([^/]*)(.*)! && $1 ne 'ssh' &&
{ proto => $1, login => $2, password => $4, machine => $5, dir => $6 };
}
sub url_obscuring_password {