Author: jdsn Date: Thu Aug 26 17:07:17 2010 New Revision: 62435 URL: http://svn.opensuse.org/viewcvs/yast?rev=62435&view=rev Log: fixed proxy settings during webyast registration (bnc#626965) Modified: trunk/registration/src/modules/YSR.pm Modified: trunk/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/YSR.pm?rev=62435&r1=62434&r2=62435&view=diff ============================================================================== --- trunk/registration/src/modules/YSR.pm (original) +++ trunk/registration/src/modules/YSR.pm Thu Aug 26 17:07:17 2010 @@ -205,12 +205,14 @@ { # not initialized - need to reinitialize - # 1. proxy - if ( exists $ctx->{'proxy'} && ref($ctx->{'proxy'}) eq "HASH" ) + # 1. proxy - fixed proxy settings (bnc#626965) + if ( exists $ctx->{'proxy-http_proxy'} || exists $ctx->{'proxy-https_proxy'} ) { - my $http = $ctx->{'proxy'}{'http_proxy'} || undef; - my $https = $ctx->{'proxy'}{'https_proxy'} || undef; - $self->set_proxy($http, $https); + my $http_proxy = $ctx->{'proxy-http_proxy'} || undef; + my $https_proxy = $ctx->{'proxy-https_proxy'} || undef; + $self->set_proxy($http_proxy, $https_proxy); + delete $ctx->{'proxy-http_proxy'}; + delete $ctx->{'proxy-https_proxy'}; } # 2. registration context -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org