Author: jdsn Date: Wed May 19 18:07:39 2010 New Revision: 62040 URL: http://svn.opensuse.org/viewcvs/yast?rev=62040&view=rev Log: - catch severe backend error and pass error message on (bnc#604777) - 2.17.32 Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/registration/VERSION?rev=62040&r1=62039&r2=62040&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/VERSION Wed May 19 18:07:39 2010 @@ -1 +1 @@ -2.17.31 +2.17.32 Modified: branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes?rev=62040&r1=62039&r2=62040&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes Wed May 19 18:07:39 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 19 18:06:26 CEST 2010 - jdsn@suse.de + +- catch severe backend error and pass error message on (bnc#604777) +- 2.17.32 + +------------------------------------------------------------------- Mon Feb 22 15:05:52 CET 2010 - mc@suse.de - fix invalid repo cache after serviceRefresh (bnc#572634) Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm?rev=62040&r1=62039&r2=62040&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm Wed May 19 18:07:39 2010 @@ -298,6 +298,12 @@ # to be on the safe side for a following registration request, we need to delete the context data $self->del_ctx(); } + elsif ( $exitcode == 2 ) # catch error 2 and send error message up one layer (bnc#604777) + { + ${$regret}{'error'} = 'Registration did not succeed due to invalid data.'; + ${$regret}{'invaliddataerror'} = '1'; + ${$regret}{'invaliddataerrormessage'} = $self->get_errormsg(); + } elsif ( $exitcode == 3 ) { ${$regret}{'error'} = 'Conflicting registration data'; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org