From 5b385a90e8f5c8acb4bae4b5fff1a30a95ea9e41 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 16 Oct 2009 18:09:40 +0000 Subject: (adding_media_failed) escape password because urpmi and its downloaders do not like some characters --- NEWS | 3 +++ mdkapplet-enterprise-update-helper | 1 + mdkapplet-restricted-helper | 1 + 3 files changed, 5 insertions(+) diff --git a/NEWS b/NEWS index 42e64837..17dd89cf 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,9 @@ - mdkapplet o display a "download all packages at once" option o offer to select where to download packages +- mdkapplet-enterprise-update-helper, mdkapplet-restricted-helper: + o escape password because urpmi and its downloaders do not like + some characters Version 2.77.5 - 8 September 2009, Aurelien Lefebvre diff --git a/mdkapplet-enterprise-update-helper b/mdkapplet-enterprise-update-helper index 974b13c6..c18747c4 100755 --- a/mdkapplet-enterprise-update-helper +++ b/mdkapplet-enterprise-update-helper @@ -166,6 +166,7 @@ sub adding_media_failed { sub actually_add_enterprise_update_medium { my ($ref, $password, $arch) = @_; + $password = uri_escape($password); my @options = ({ sensitive_arguments => 1 }, 'urpmi.addmedia', '--xml-info', 'always'); my $uri = "https://" . uri_escape($ref->{data}{email}) . ":$password\@download.mandriva.com/$version/rpms/$arch/"; run_program::raw(@options, '--update', '--distrib', $uri); diff --git a/mdkapplet-restricted-helper b/mdkapplet-restricted-helper index 790b9e43..94f290d3 100755 --- a/mdkapplet-restricted-helper +++ b/mdkapplet-restricted-helper @@ -171,6 +171,7 @@ sub adding_media_failed { sub actually_add_restricted_medium { my ($ref, $password, $arch) = @_; + $password = uri_escape($password); my @options = ({ sensitive_arguments => 1 }, 'urpmi.addmedia', '--xml-info', 'always'); my $uri = "https://" . uri_escape($ref->{data}{email}) . ":$password\@dl.mandriva.com/rpm/comm/$version/"; run_program::raw(@options, "Restricted $arch " . int(rand(100000)), "$uri$arch") or return 0; -- cgit v1.2.1