[yast-commit] r52202 - in /trunk/registration: VERSION package/yast2-registration.changes src/clients/inst_suse_register.ycp src/modules/Register.ycp
Author: jdsn
Date: Tue Oct 14 20:39:39 2008
New Revision: 52202
URL: http://svn.opensuse.org/viewcvs/yast?rev=52202&view=rev
Log:
- check if initialization of SuseRegister succeeds (bnc#435188)
- initialize the target to prevent repeated key import (bnc#435192)
- adapting repo changes as well in autoYaST mode
- 2.17.3
Modified:
trunk/registration/VERSION
trunk/registration/package/yast2-registration.changes
trunk/registration/src/clients/inst_suse_register.ycp
trunk/registration/src/modules/Register.ycp
Modified: trunk/registration/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=52202&r1=52201&r2=52202&view=diff
==============================================================================
--- trunk/registration/VERSION (original)
+++ trunk/registration/VERSION Tue Oct 14 20:39:39 2008
@@ -1 +1 @@
-2.17.2
+2.17.3
Modified: trunk/registration/package/yast2-registration.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=52202&r1=52201&r2=52202&view=diff
==============================================================================
--- trunk/registration/package/yast2-registration.changes (original)
+++ trunk/registration/package/yast2-registration.changes Tue Oct 14 20:39:39 2008
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Tue Oct 14 18:06:33 CEST 2008 - jdsn@suse.de
+
+- check if initialization of SuseRegister succeeds (bnc#435188)
+- initialize the target to prevent repeated key import (bnc#435192)
+- adapting repo changes as well in autoYaST mode
+- 2.17.3
+
+-------------------------------------------------------------------
Mon Oct 13 18:38:31 CEST 2008 - jdsn@suse.de
- support repository changes in catalogs (bnc#430896)
Modified: trunk/registration/src/clients/inst_suse_register.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_suse_register.ycp?rev=52202&r1=52201&r2=52202&view=diff
==============================================================================
--- trunk/registration/src/clients/inst_suse_register.ycp (original)
+++ trunk/registration/src/clients/inst_suse_register.ycp Tue Oct 14 20:39:39 2008
@@ -243,6 +243,9 @@
string details = _("Details...");
string error_msg = _("Error");
string starting_browser = _("Starting browser...");
+ string error_target_init_failed = _("Initialization failed.\nCan not interact with the package system.");
+ string message_install_missing_packages = _("In order to registrer properly the system
+needs to install the following packages.");
/* other string variables */
string information_text = "";
@@ -867,13 +870,12 @@
if ( taskList != $[] )
{
- // add/delete/change repositories
-
string oldMessage = _("Setting up online update source...");
string newMessage = _("Updating software repositories...");
UI::OpenDialog(`VBox(`Label( oldMessage )));
- repoSummary = Register::updateSoftwareRepositories(taskList);
+ // add/delete/change repositories
+ repoSummary = Register::updateSoftwareRepositories(taskList, true);
// #186978 - hide the passwords of the urls in the status window
// now obsolete - the summary created by "updateSoftwareRepositories" will not contain passwords of URLs
@@ -886,13 +888,6 @@
// (#261239) show success popup only on success else error message
if (repoSummary != nil && size(repoSummary) != 0)
{
- // on successful registration and only if there were changes, we need to refresh all sources
- list<integer> currentSources = Pkg::SourceGetCurrent( true );
- foreach (integer srcID, currentSources, {
- y2milestone("Refreshing source with ID: %1", srcID);
- Pkg::SourceForceRefreshNow(srcID);
- });
-
UI::OpenDialog( nccc_success );
repeat
{
@@ -941,8 +936,16 @@
}
+ // error handling - initialization of target failed
+ if ( SRstatus == 113 )
+ {
+ Popup::Message(error_target_init_failed);
+ loopend = true;
+ }
+
+
// handle any other error codes
- if ( contains([0, 1, 3, 101, 198, 199], SRstatus) == false )
+ if ( contains([0, 1, 3, 101, 113, 198, 199], SRstatus) == false )
{
// display error message
error_msg_details = YSR::get_errormsg();
@@ -950,6 +953,15 @@
error_msg_details = "";
}
+/*
+ DOCUMENTATION OF ERROR CODES
+ * 111: a generic unknown error uccurred during a SuseRegister call
+ * 112: the initialization of SuseRegister failed; no special message is used for that though
+ * 113: the initialization if the target failed - no interaction with the package system possible
+ * 198: the system did not find any browser to let the user perform the manual interaction part of the registration
+ * 199: unknown error uccurred (no longer used)
+*/
+
}
else
{
Modified: trunk/registration/src/modules/Register.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Register.ycp?rev=52202&r1=52201&r2=52202&view=diff
==============================================================================
--- trunk/registration/src/modules/Register.ycp (original)
+++ trunk/registration/src/modules/Register.ycp Tue Oct 14 20:39:39 2008
@@ -24,7 +24,7 @@
import "YSR";
import "ProductFeatures";
import "SourceManager";
-
+import "Installation";
// --------------------------------------------------------------
// START: Locally defined data
@@ -32,9 +32,11 @@
string services_file = sformat ("%1/update_services", SCR::Read (.target.tmpdir));
boolean isInitializedSR = false;
+boolean isInitializedTarget = false;
map
participants (1)
-
jdsn@svn.opensuse.org