Author: jdsn Date: Wed Oct 29 19:43:03 2008 New Revision: 52709 URL: http://svn.opensuse.org/viewcvs/yast?rev=52709&view=rev Log: remove requires to sles-release fix makefile 2.17.10 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp trunk/registration/src/config/Makefile.am trunk/registration/yast2-registration.spec.in Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=52709&r1=52708&r2=52709&view=diff ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Wed Oct 29 19:43:03 2008 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=52709&r1=52708&r2=52709&view=diff ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Wed Oct 29 19:43:03 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 16:32:31 CET 2008 - jdsn@suse.de + +- remove requires to sles-release +- 2.17.10 + +------------------------------------------------------------------- Wed Oct 29 15:31:04 CET 2008 - jdsn@suse.de - consistent naming in autoYaST profile 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=52709&r1=52708&r2=52709&view=diff ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Wed Oct 29 19:43:03 2008 @@ -577,6 +577,7 @@ boolean launchBrowser(string url) { + boolean retval=false; y2milestone("Just about to start a browser for manual interaction in registration."); // check for valid url map parsed = URL::Parse(url); @@ -600,16 +601,18 @@ if (textmode) { y2milestone("Launching textmode browser with: %1", command); - UI::RunInTerminal(command); + retval = ( (integer)UI::RunInTerminal(command) == 0 ) ? true:false; } else { y2milestone("Launching graphical borwser with: %1", command); - SCR::Execute(.target.bash, command ); + retval = ( (integer)SCR::Execute(.target.bash, command ) == 0 ) ? true:false; } + y2milestone("The registration browser returned with error code: %1", retval); + UI::RedrawScreen(); - return true; + return retval; } @@ -897,7 +900,7 @@ else if ( SRstatus == 1 ) { // still needinfo, change displayed information and stay in manual interaction - manual_interaction_overview = Register::suseRegisterListParams(); + manual_interaction_overview = YSR::get_registerReadableText(); // (bnc#435869) UI::ChangeWidget( `id(`needinfo), `Value, manual_interaction_overview ); } else Modified: trunk/registration/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/Makefile.am?rev=52709&r1=52708&r2=52709&view=diff ============================================================================== --- trunk/registration/src/config/Makefile.am (original) +++ trunk/registration/src/config/Makefile.am Wed Oct 29 19:43:03 2008 @@ -3,7 +3,7 @@ desktop_DATA = suse_register.desktop customer_center.desktop online_update_configuration.desktop rncdir = $(schemadir)/autoyast/rnc -rnc_DATA = registration.rnc automatic_online_update.rnc +rnc_DATA = registration.rnc online_update_configuration.rnc fillup_DATA = sysconfig.suse_register-yast2-registration sysconfig.automatic_online_update-yast2-registration Modified: trunk/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/yast2-registration.spec.in?rev=52709&r1=52708&r2=52709&view=diff ============================================================================== --- trunk/registration/yast2-registration.spec.in (original) +++ trunk/registration/yast2-registration.spec.in Wed Oct 29 19:43:03 2008 @@ -14,7 +14,7 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-packager BuildRequires: perl-TimeDate limal limal-perl limal-ca-mgm-perl BuildRequires: yast2-pkg-bindings >= 2.17.20 -BuildRequires: suseRegister sles-release +BuildRequires: suseRegister BuildArchitectures: noarch @@ -57,8 +57,7 @@ %dir @yncludedir@/registration @yncludedir@/registration/*.ycp @desktopdir@/*.desktop -@schemadir@/autoyast/rnc/registration.rnc -@schemadir@/autoyast/rnc/automatic_online_update.rnc +@schemadir@/autoyast/rnc/*.rnc /usr/lib/YaST2/bin/online_update /usr/share/YaST2/yastbrowser -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org