Mailinglist Archive: yast-commit (819 mails)

< Previous Next >
[yast-commit] r54928 - /branches/SuSE-Code-11-Branch/registration/src/modules/Register.ycp
  • From: jdsn@xxxxxxxxxxxxxxxx
  • Date: Thu, 22 Jan 2009 20:39:14 -0000
  • Message-id: <E1LQ6KY-0006y8-Gd@xxxxxxxxxxxxxxxx>
Author: jdsn
Date: Thu Jan 22 21:39:14 2009
New Revision: 54928

URL: http://svn.opensuse.org/viewcvs/yast?rev=54928&view=rev
Log:
fix for proxy setup for registration (bnc#468480)

Modified:
branches/SuSE-Code-11-Branch/registration/src/modules/Register.ycp

Modified: branches/SuSE-Code-11-Branch/registration/src/modules/Register.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/registration/src/modules/Register.ycp?rev=54928&r1=54927&r2=54928&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/registration/src/modules/Register.ycp
(original)
+++ branches/SuSE-Code-11-Branch/registration/src/modules/Register.ycp Thu Jan
22 21:39:14 2009
@@ -1346,7 +1346,7 @@

if ( repoUpdateSuccessful )
{
- y2error("SuseRegister will now save the lastZmdConfig.");
+ y2milestone("SuseRegister will now save the lastZmdConfig.");
YSR::saveLastZmdConfig();
}
else
@@ -1446,6 +1446,21 @@
// Pkg::CallbackAuthentication(nil);
}

+ // setting the proxy must happen before init_ctx is called (bnc#468480)
+ // setting up proxy for SuseRegister
+ if (Register::use_proxy)
+ {
+ if (Register::http_proxy != nil && Register::https_proxy != nil)
+ {
+ y2milestone("Setting up proxy for SuseRegister. http_proxy: %1
-- https_proxy: %2", Register::http_proxy, Register::https_proxy);
+ YSR::set_proxy(Register::http_proxy, Register::https_proxy);
+ }
+ else
+ {
+ y2error("Proxy settings are broken and could not be applied to
SuseRegister.");
+ }
+ }
+
// initialize SuseRegister
contextDataSR = contextData;
y2milestone("Initializing SuseRegister with this context data: %1",
contextDataSR);
@@ -1462,20 +1477,6 @@
y2error("Initializing SuseRegister failed with error code (%1) and
error message: %2", initErrorCode, YSR::get_errormsg());
return initErrorCode;
}
-
- // setting up proxy for SuseRegister
- if (Register::use_proxy)
- {
- if (Register::http_proxy != nil && Register::https_proxy != nil)
- {
- y2milestone("Setting up proxy for SuseRegister. http_proxy: %1
-- https_proxy: %2", Register::http_proxy, Register::https_proxy);
- YSR::set_proxy(Register::http_proxy, Register::https_proxy);
- }
- else
- {
- y2error("Proxy settings are broken and could not be applied to
SuseRegister.");
- }
- }
}

// ----==== handle modes for suseRegister ====----

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages