Author: locilka Date: Fri Dec 11 17:07:32 2009 New Revision: 60083 URL: http://svn.opensuse.org/viewcvs/yast?rev=60083&view=rev Log: Adapted for new API to ProductLicense (FATE #306295) Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_license.ycp branches/SuSE-Code-11-SP1-Branch/installation/yast2-installation.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes?rev=60083&r1=60082&r2=60083&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Fri Dec 11 17:07:32 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Dec 11 16:48:58 CET 2009 - locilka@suse.cz + +- Adapted for new API to ProductLicense (FATE #306295). + +------------------------------------------------------------------- Wed Dec 9 16:44:34 CET 2009 - locilka@suse.cz - Package kde4-kdm has been renamed to kdm (SLES, SLED control Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp?rev=60083&r1=60082&r2=60083&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp Fri Dec 11 17:07:32 2009 @@ -53,6 +53,8 @@ boolean text_mode = Language::GetTextMode (); + string license_ui_id = "base_license"; + /* ---------------------------------------------------------------------- * Build dialog * ----------------------------------------------------------------------*/ @@ -221,7 +223,7 @@ language = (string) UI::QueryWidget (`id (`language), `Value); keyboard = (string) UI::QueryWidget (`id (`keyboard), `Value); - if (ProductLicense::AcceptanceNeeded()) { + if (ProductLicense::AcceptanceNeeded (license_ui_id)) { license_acc = (boolean) UI::QueryWidget (`id (`license_agreement), `Value); } else { license_acc = true; @@ -295,7 +297,7 @@ return false; } - ProductLicense::ShowLicenseInInstallation (`base_license_rp); + ProductLicense::ShowLicenseInInstallation (`base_license_rp, Pkg::SourceGetCurrent(true)[0]:0); // bugzilla #206706 if (Mode::autoinst()) { @@ -303,7 +305,7 @@ } // If accepting the license is required, show the check-box - if (ProductLicense::AcceptanceNeeded()) { + if (ProductLicense::AcceptanceNeeded (license_ui_id)) { UI::ReplaceWidget (`license_checkbox_rp, license_agreement_checkbox); } @@ -331,7 +333,7 @@ if (ret == `next ) { // BNC #448598 // Check whether the license has been accepted only if required - if (ProductLicense::AcceptanceNeeded() && ! LicenseAccepted ()) + if (ProductLicense::AcceptanceNeeded (license_ui_id) && ! LicenseAccepted ()) continue; if (!Language::CheckIncompleteTranslation (language)) @@ -349,7 +351,7 @@ if (ret == `next) break; } else if (ret == `show_fulscreen_license) { UI::OpenDialog (AllLicensesDialog()); - ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp); + ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp, Pkg::SourceGetCurrent(true)[0]:0); UI::CloseDialog(); } } Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_license.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_license.ycp?rev=60083&r1=60082&r2=60083&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_license.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_license.ycp Fri Dec 11 17:07:32 2009 @@ -53,7 +53,7 @@ if (Stage::initial ()) { - ask_ret = ProductLicense::AskFirstStageLicenseAgreement (action); + ask_ret = ProductLicense::AskFirstStageLicenseAgreement (0, action); } else { @@ -81,7 +81,7 @@ directory = Directory::custom_workflow_dir + directory; // patterns are hardcoded - ask_ret = ProductLicense::AskInstalledLicenseAgreement (directory, [], action); + ask_ret = ProductLicense::AskInstalledLicenseAgreement (directory, [], action, "0"); } if (test_mode) Wizard::CloseDialog(); Modified: branches/SuSE-Code-11-SP1-Branch/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/yast2-installation.spec.in?rev=60083&r1=60082&r2=60083&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/yast2-installation.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/yast2-installation.spec.in Fri Dec 11 17:07:32 2009 @@ -37,8 +37,8 @@ # Pkg::SourceProvideDigestedFile() Conflicts: yast2-pkg-bindings < 2.17.25 -# BNC #449818: "description_id" in DefaultDesktop -Requires: yast2-packager >= 2.17.49 +# New API to ProductLicense module +Requires: yast2-packager >= 2.17.64 # Storage::GetCommitInfo() call in include/misc.ycp Requires: yast2-storage >= 2.17.47 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org