Author: jdsn Date: Thu Oct 16 13:21:31 2008 New Revision: 52290 URL: http://svn.opensuse.org/viewcvs/yast?rev=52290&view=rev Log: - call to saveLastZmdConfig added (bnc#435696) - removed installing the certificate to zmd (bnc#435631) - add credetials information to services url (bnc#435645) - fix xulrunner dependency (bnc#435872) - 2.17.4 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp trunk/registration/src/modules/Register.ycp trunk/registration/yast2-registration.spec.in Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=52290&r1=52289&r2=52290&view=diff ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Thu Oct 16 13:21:31 2008 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=52290&r1=52289&r2=52290&view=diff ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Thu Oct 16 13:21:31 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Oct 16 13:12:43 CEST 2008 - jdsn@suse.de + +- call to saveLastZmdConfig added (bnc#435696) +- removed installing the certificate to zmd (bnc#435631) +- add credetials information to services url (bnc#435645) +- fix xulrunner dependency (bnc#435872) +- 2.17.4 + +------------------------------------------------------------------- Tue Oct 14 18:06:33 CEST 2008 - jdsn@suse.de - check if initialization of SuseRegister succeeds (bnc#435188) 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=52290&r1=52289&r2=52290&view=diff ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Thu Oct 16 13:21:31 2008 @@ -532,11 +532,17 @@ } else { - // check for and install mozilla-xulrunner if needed (#175166), modified due to (#304310) - string required_package = "mozilla-xulrunner181"; - if (!Package::Installed(required_package)) + // see if xulrunner is already there (bnc#435872) + cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/xulrunner") == 0 ? true:false; + + if ( ! cmd_ok ) { - Package::InstallAllMsg([required_package], nil); + // check for and install mozilla-xulrunner if needed (#175166), modified due to (#304310), modified due to (bnc#435872) + string required_package = "mozilla-xulrunner190"; + if (!Package::Installed(required_package)) + { + Package::InstallAllMsg([required_package], nil); + } } cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/xulrunner") == 0 ? true:false; bcmd = " MOZ_DISABLE_PANGO=1 /usr/bin/xulrunner /usr/share/YaST2/yastbrowser/application.ini -url "; Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Register.ycp?rev=52290&r1=52289&r2=52290&view=diff ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Thu Oct 16 13:21:31 2008 @@ -1105,7 +1105,8 @@ summary = add(summary, sformat(_("Added Service: %1"), pService )); // because the Pkg bindings do not operate on the system directly we need to save them before we can continue - if ( Pkg::ServiceSave ) +// if ( Pkg::ServiceSave ) // function not yet available + if ( true ) { y2milestone("Successfully saved services."); Modified: trunk/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/yast2-registration.spec.in?rev=52290&r1=52289&r2=52290&view=diff ============================================================================== --- trunk/registration/yast2-registration.spec.in (original) +++ trunk/registration/yast2-registration.spec.in Thu Oct 16 13:21:31 2008 @@ -6,9 +6,7 @@ # because of SourceManager Requires: yast2-packager >= 2.13.152 -%if %sles_version -Requires: zmd rug -%endif +Requires: mozilla-xulrunner190 PreReq: %fillup_prereq -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org