December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60132 - /tags/branch-Code-11-SP1-2_17_27/ldap-server/
by rhafer＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: rhafer Date: Wed Dec 16 17:50:22 2009 New Revision: 60132 URL: http://svn.opensuse.org/viewcvs/yast?rev=60132&view=rev Log: Created tag branch-Code-11-SP1-2_17_27 for ldap-server Added: tags/branch-Code-11-SP1-2_17_27/ldap-server/ (props changed) - copied from r60131, branches/SuSE-Code-11-SP1-Branch/ldap-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60131 - /tags/branch-Code-11-SP1-2_17_27/
by rhafer＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: rhafer Date: Wed Dec 16 17:50:17 2009 New Revision: 60131 URL: http://svn.opensuse.org/viewcvs/yast?rev=60131&view=rev Log: Created tag branch-Code-11-SP1-2_17_27 Added: tags/branch-Code-11-SP1-2_17_27/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60130 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: rhafer Date: Wed Dec 16 17:13:55 2009 New Revision: 60130 URL: http://svn.opensuse.org/viewcvs/yast?rev=60130&view=rev Log: Preparing 2.17.27 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION Wed Dec 16 17:13:55 2009 @@ -1 +1 @@ -2.17.26 +2.17.27 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Wed Dec 16 17:13:55 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Dec 16 15:31:42 UTC 2009 - rhafer(a)novell.com + +- Version 2.17.27 +- fixed the creation/modifcation of the Update Referral settings + for slave databases (bnc#565164) + +------------------------------------------------------------------- Fri Dec 11 14:57:50 UTC 2009 - rhafer(a)novell.com - Version 2.17.26 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60129 - /tags/stable-2_19_5/network/
by mzugec＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: mzugec Date: Wed Dec 16 16:44:59 2009 New Revision: 60129 URL: http://svn.opensuse.org/viewcvs/yast?rev=60129&view=rev Log: Created tag stable-2_19_5 for network Added: tags/stable-2_19_5/network/ - copied from r60128, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60128 - in /trunk/network: VERSION package/yast2-network.changes src/services/dns.ycp
by mzugec＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: mzugec Date: Wed Dec 16 16:44:47 2009 New Revision: 60128 URL: http://svn.opensuse.org/viewcvs/yast?rev=60128&view=rev Log: DNS: warn user to not use .local as domain name (bnc#564317) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/services/dns.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=60128&r1=601… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Dec 16 16:44:47 2009 @@ -1 +1 @@ -2.19.4 +2.19.5 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Dec 16 16:44:47 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 16 15:59:25 CET 2009 - mzugec(a)suse.cz + +- DNS: warn user to not use .local as domain name (bnc#564317) +- 2.19.5 + +------------------------------------------------------------------- Mon Dec 7 16:18:51 CET 2009 - kmachalkova(a)suse.cz - With enabled SuSEFirewall, set SuSEFirewall's FW_ROUTE variable Modified: trunk/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/dns.ycp?rev… ============================================================================== --- trunk/network/src/services/dns.ycp (original) +++ trunk/network/src/services/dns.ycp Wed Dec 16 16:44:47 2009 @@ -200,6 +200,9 @@ if (!dhn || value != "") { + if (value=="local"){ + if (!Popup::YesNo(_("It's not recomended to use .local as domainname due to Multicast DNS. Use it on your own risk?"))) return false; + } return Hostname::CheckDomain (value); } return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60127 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server/src: LdapDatabase.ycp LdapServer.pm agent/SlapdConfigAgent.cc
by rhafer＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: rhafer Date: Wed Dec 16 16:30:41 2009 New Revision: 60127 URL: http://svn.opensuse.org/viewcvs/yast?rev=60127&view=rev Log: fix updateref handling (bnc#565164) - agent honor "use_provider" setting now - disable update ref widgets upon startup if "use_provider" is set - don't configure an updateref if hostname is empty Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp Wed Dec 16 16:30:41 2009 @@ -1556,6 +1556,20 @@ if ( UI::QueryWidget( `cb_syncrepl, `Value ) == true ) { UI::ChangeWidget( `f_synccons, `Enabled, true ); + if ( (boolean)UI::QueryWidget( `cb_update_ref, `Value ) == true ) + { + UI::ChangeWidget( `te_updateref_target, `Enabled, true ); + UI::ChangeWidget( `cb_updateref_prot, `Enabled, true ); + UI::ChangeWidget( `if_updateref_port, `Enabled, true ); + UI::ChangeWidget( `te_updateref_target, `Value, "" ); + } + else + { + UI::ChangeWidget( `te_updateref_target, `Enabled, false ); + UI::ChangeWidget( `cb_updateref_prot, `Enabled, false ); + UI::ChangeWidget( `if_updateref_port, `Enabled, false ); + UI::ChangeWidget( `te_updateref_target, `Value, "" ); + } } else { @@ -1742,7 +1756,7 @@ if ( (boolean) UI::QueryWidget( `cb_update_ref, `Value) ) { map<string,any> updateref = $[]; - if ( (string)UI::QueryWidget(`cb_updateref_prot, `Value) != "" ) + if ( (string)UI::QueryWidget(`te_updateref_target, `Value) != "" ) { updateref = add(updateref, "protocol", (string)UI::QueryWidget(`cb_updateref_prot, `Value) ); updateref = add(updateref, "target", (string)UI::QueryWidget(`te_updateref_target, `Value) ); Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Wed Dec 16 16:30:41 2009 @@ -1794,6 +1794,7 @@ "credentials" => $syncpw, "basedn" => "cn=config", "starttls" => YaST::YCP::Boolean(1), + "syncrepl" => { 'use_provider' => YaST::YCP::Boolean(1) } }; SCR->Write(".ldapserver.database.{0}.syncrepl", $syncrepl ); $syncrepl->{'basedn'} = $dbDefaults{'suffix'}; Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc Wed Dec 16 16:30:41 2009 @@ -1833,11 +1833,23 @@ YCPMap updaterefMap = argMap->value(YCPString("updateref"))->asMap(); if ( updaterefMap.size() > 0 ) { - LDAPUrl updaterefUrl; - updaterefUrl.setScheme( updaterefMap->value(YCPString("protocol"))->asString()->value_cstr() ); - updaterefUrl.setHost( updaterefMap->value(YCPString("target"))->asString()->value_cstr() ); - updaterefUrl.setPort( updaterefMap->value(YCPString("port"))->asInteger()->value() ); - (*i)->setStringValue("olcUpdateRef", updaterefUrl.getURLString() ); + if ( !updaterefMap->value(YCPString("use_provider")).isNull() && + updaterefMap->value(YCPString("use_provider"))->asBoolean()->value() ) + { + (*i)->setStringValue("olcUpdateRef", prvuri.getURLString() ); + } + else + { + LDAPUrl updaterefUrl; + updaterefUrl.setScheme( updaterefMap->value(YCPString("protocol"))->asString()->value_cstr() ); + updaterefUrl.setHost( updaterefMap->value(YCPString("target"))->asString()->value_cstr() ); + updaterefUrl.setPort( updaterefMap->value(YCPString("port"))->asInteger()->value() ); + (*i)->setStringValue("olcUpdateRef", updaterefUrl.getURLString() ); + } + } + else + { + (*i)->setStringValue("olcUpdateRef", "" ); } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60126 - /trunk/installation/src/clients/inst_license.ycp
by locilka＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: locilka Date: Wed Dec 16 15:43:37 2009 New Revision: 60126 URL: http://svn.opensuse.org/viewcvs/yast?rev=60126&view=rev Log: Continuing with multi-license dialog Modified: trunk/installation/src/clients/inst_license.ycp Modified: trunk/installation/src/clients/inst_license.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_li… ============================================================================== --- trunk/installation/src/clients/inst_license.ycp (original) +++ trunk/installation/src/clients/inst_license.ycp Wed Dec 16 15:43:37 2009 @@ -21,6 +21,7 @@ import "Mode"; import "ProductFeatures"; import "Wizard"; +import "Report"; // all the arguments map argmap = GetInstArgs::argmap(); @@ -60,9 +61,16 @@ // #304865: Enhance YaST Modules to cooperate better handling the product licenses string directory = argmap["directory"]:""; + // FATE #306295: More licenses in one dialog + list <string> directories = argmap["directories"]:[]; + + // Priority 0: More directories + if (directories != nil && directories != []) { + y2milestone ("Using directories: %1", directories); // Priority 1: Script args - if (directory != nil && directory != "") { + } else if (directory != nil && directory != "") { y2milestone ("Using directory: %1", directory); + directories = [directory]; // Priority 2: Fallback - Control file } else { directory = ProductFeatures::GetStringFeature ("globals", "base_product_license_directory"); @@ -75,13 +83,28 @@ directory = "/etc/YaST2/licenses/base/"; y2warning ("No 'base_product_license_directory' set, using %1", directory); } + + directories = [directory]; } - if (directory != "") - directory = Directory::custom_workflow_dir + directory; + if (directories != nil) { + list <string> tmp_directories = maplist (string one_directory, directories, { + return Directory::custom_workflow_dir + one_directory; + }); + directories = tmp_directories; + y2milestone ("License directories after additional modifications: %1", directories); + } - // patterns are hardcoded - ask_ret = ProductLicense::AskInstalledLicenseAgreement (directory, [], action, "0"); + if (directories == nil || directories == []) { + // Error message + Report::Error (_("Internal error: Missing license to show")); + y2error ("Nothing to do"); + ask_ret = `auto; + } else if (size (directories) > 1) { + ask_ret = ProductLicense::AskInstalledLicensesAgreement (directories, action); + } else { + ask_ret = ProductLicense::AskInstalledLicenseAgreement (directories[0]:"", action); + } } if (test_mode) Wizard::CloseDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60125 - /branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_license.ycp
by locilka＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: locilka Date: Wed Dec 16 15:43:24 2009 New Revision: 60125 URL: http://svn.opensuse.org/viewcvs/yast?rev=60125&view=rev Log: Continuing with multi-license dialog Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_license.ycp 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/insta… ============================================================================== --- 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 Wed Dec 16 15:43:24 2009 @@ -21,6 +21,7 @@ import "Mode"; import "ProductFeatures"; import "Wizard"; +import "Report"; // all the arguments map argmap = GetInstArgs::argmap(); @@ -60,9 +61,16 @@ // #304865: Enhance YaST Modules to cooperate better handling the product licenses string directory = argmap["directory"]:""; + // FATE #306295: More licenses in one dialog + list <string> directories = argmap["directories"]:[]; + + // Priority 0: More directories + if (directories != nil && directories != []) { + y2milestone ("Using directories: %1", directories); // Priority 1: Script args - if (directory != nil && directory != "") { + } else if (directory != nil && directory != "") { y2milestone ("Using directory: %1", directory); + directories = [directory]; // Priority 2: Fallback - Control file } else { directory = ProductFeatures::GetStringFeature ("globals", "base_product_license_directory"); @@ -75,13 +83,28 @@ directory = "/etc/YaST2/licenses/base/"; y2warning ("No 'base_product_license_directory' set, using %1", directory); } + + directories = [directory]; } - if (directory != "") - directory = Directory::custom_workflow_dir + directory; + if (directories != nil) { + list <string> tmp_directories = maplist (string one_directory, directories, { + return Directory::custom_workflow_dir + one_directory; + }); + directories = tmp_directories; + y2milestone ("License directories after additional modifications: %1", directories); + } - // patterns are hardcoded - ask_ret = ProductLicense::AskInstalledLicenseAgreement (directory, [], action, "0"); + if (directories == nil || directories == []) { + // Error message + Report::Error (_("Internal error: Missing license to show")); + y2error ("Nothing to do"); + ask_ret = `auto; + } else if (size (directories) > 1) { + ask_ret = ProductLicense::AskInstalledLicensesAgreement (directories, action); + } else { + ask_ret = ProductLicense::AskInstalledLicenseAgreement (directories[0]:"", action); + } } if (test_mode) Wizard::CloseDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60124 - /trunk/packager/src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: locilka Date: Wed Dec 16 15:41:43 2009 New Revision: 60124 URL: http://svn.opensuse.org/viewcvs/yast?rev=60124&view=rev Log: Continuing with multi-license dialog Modified: trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Wed Dec 16 15:41:43 2009 @@ -139,7 +139,7 @@ return license_file; } -global term GetLicenseContent (string lic_lang, map <string, string> & licenses) { +global term GetLicenseContent (string lic_lang, map <string, string> & licenses, string id) { string license_file = WhichLicenceFile (lic_lang, licenses); string license_text = (string) SCR::Read(.target.string, license_file); @@ -152,13 +152,13 @@ // License is HTML (or RichText) if (regexpmatch(license_text, "</.*>")) - rt = `MinWidth (80, `RichText(`id (`welcome_text), + rt = `MinWidth (80, `RichText(`id (sformat("welcome_text_%1", id)), license_text )); // License is plain text // details in BNC #449188 else - rt = `MinWidth (80, `RichText(`id (`welcome_text), + rt = `MinWidth (80, `RichText(`id (sformat("welcome_text_%1", id)), "<pre>" + String::EscapeTags (license_text) + "</pre>" )); @@ -171,7 +171,7 @@ term GetLicenseDialogTerm (list<string> languages, string license_language, map <string, string> & licenses, string id) { string license_text = ""; - term rt = GetLicenseContent (license_language, licenses); + term rt = GetLicenseContent (license_language, licenses, id); // bug #204791, no more "languages.ycp" client map<string,list> lang_names_orig = Language::GetLanguagesMap (false); @@ -285,29 +285,22 @@ } } -/** - * Displays License with Help and ( ) Yes / ( ) No radio buttons - * @param string file with the license - */ -void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map <string, string> & licenses, string id) { +term GetLicenseDialog (list<string> languages, string license_language, map <string, string> & licenses, string id, boolean spare_space) { map display = UI::GetDisplayInfo(); integer space = display["TextMode"]:true ? 1 : 3; - // dialog caption - string caption = _("License Agreement"); - term license_buttons = `VBox ( - `VSpacing (2), - `RadioButtonGroup(`id(`eula), + `VSpacing ((spare_space ? 0:2)), + `RadioButtonGroup(`id (sformat ("eula_%1", id)), `HBox( `HSpacing (2*space), `VBox( - `Left(`RadioButton(`id(`yes), + `Left(`RadioButton(`id (sformat("yes_%1", id)), `opt(`notify), // radio button _("&Yes, I Agree to the License Agreement") )), - `Left(`RadioButton(`id(`no), + `Left(`RadioButton(`id (sformat("no_%1", id)), `opt(`notify), // radio button _("N&o, I Do Not Agree") @@ -318,8 +311,8 @@ ) ); - term contents = `VBox ( - `VSpacing (1), + return `VBox ( + `VSpacing ((spare_space ? 0:1)), `HBox ( `HSpacing (2*space), GetLicenseDialogTerm (languages, license_language, licenses, id), @@ -333,7 +326,7 @@ : `Empty() ), - `VSpacing(1), + `VSpacing((spare_space ? 0.5 : 1)), `HBox ( `HSpacing (2*space), (license_file_print != nil ? @@ -351,22 +344,35 @@ ), `HSpacing (2*space) ), - `VSpacing (1) + `VSpacing ((spare_space ? 0:1)) ); +} +string GetLicenseDialogHelp () { // help text - string help = _("Read the license agreement carefully and select + return _("Read the license agreement carefully and select one of the available options. If you do not agree to the license agreement, the configuration will be aborted. "); +} + +/** + * Displays License with Help and ( ) Yes / ( ) No radio buttons + * @param string file with the license + */ +void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map <string, string> & licenses, string id) { + // dialog caption + string caption = _("License Agreement"); + + term contents = GetLicenseDialog (languages, license_language, licenses, id, false); // If acceptance is not needed, there's no need to disable the button // by default boolean default_next_button_state = (AcceptanceNeeded (id) ? false : true); - Wizard::SetContents(caption, contents, help, + Wizard::SetContents(caption, contents, GetLicenseDialogHelp(), back, default_next_button_state); - + Wizard::SetTitleIcon ("yast-license"); Wizard::SetFocusToNextButton(); } @@ -771,7 +777,7 @@ lic_lang = (string) UI::QueryWidget (`id (sformat ("license_language_%1", id)), `Value); term rp_id = `id (sformat ("license_contents_rp_%1", id)); if (UI::WidgetExists (rp_id)) { - UI::ReplaceWidget (rp_id, GetLicenseContent (lic_lang, licenses)); + UI::ReplaceWidget (rp_id, GetLicenseContent (lic_lang, licenses, id)); } else { y2error ("No such widget: %1", rp_id); } @@ -794,7 +800,7 @@ } // All licenses have to be accepted - if ((symbol) UI::QueryWidget(`id (eula_id), `CurrentButton) != `yes) { + if (regexpmatch ((string) UI::QueryWidget(`id (eula_id), `CurrentButton), "^yes_")) { accepted = false; break; } @@ -816,9 +822,9 @@ y2error ("Widget %1 does not exist", eula_id); } - symbol current_button = (symbol) UI::QueryWidget(`id (eula_id), `CurrentButton); + string current_button = (string) UI::QueryWidget(`id (eula_id), `CurrentButton); // license have to be accepted or declined - if (current_button != `yes && current_button != `no) { + if (current_button == nil) { y2warning ("License %1 hasn't been accepted or declined", eula_id); ret = false; break; @@ -840,7 +846,7 @@ ret = `language; // bugzilla #303828 // disabled next button unless yes/no is selected - } else if (ret == `yes || ret == `no) { + } else if (is (ret, string) && (regexpmatch (tostring(ret), "^yes_") || regexpmatch (tostring(ret), "^no_"))) { if (AllLicensesAcceptedOrDeclined()) Wizard::EnableNextButton(); } @@ -1017,6 +1023,129 @@ return ret; } +/** + * Ask user to confirm license agreement + * @param src_id integer repository to get the license from. + * If set to 'nil', the license is considered to belong to a base product + * @param list <string> dirs - directories to look for the licenses + * @param patterns a list of patterns for the files, regular expressions + * with %1 for the language + * @param boolean enable_back sets the back_button status + * @param boolean base_product defines whether it is a base or add-on product + * true means base product, false add-on product + * @param require_agreement means that even if the license (or the very same license) + * has been already accepetd, ask user to accept it again (because of 'going back' + * in the installation proposal). + */ +global symbol AskLicensesAgreement (list <string> dirs, + list<string> patterns, string action, boolean enable_back, + boolean base_product, boolean require_agreement) +{ + if (dirs == nil || dirs == []) { + y2error ("No directories: %1", dirs); + // error message + Report::Error ("Internal Error: No license to show"); + return `auto; + } + + symbol init_ret = nil; + + if (init_ret == `auto || init_ret == `accepted) { + y2milestone ("Returning %1", init_ret); + return init_ret; + } + + boolean created_new_dialog = false; + + // #459391 + // If a progress is running open another dialog + if (Progress::IsRunning()) { + y2milestone ("Some progress is running, opening new dialog for license..."); + Wizard::OpenNextBackDialog(); + created_new_dialog = true; + } + + // dialog caption + string caption = _("License Agreement"); + + list <string> license_idents = []; + + // initial loop + symbol ret = nil; + + list <map <string, string> > licenses = []; + integer counter = -1; + term contents = `VBox(); + // If acceptance is not needed, there's no need to disable the button + // by default + boolean default_next_button_state = true; + + foreach (string dir, dirs, { + counter = counter + 1; + licenses[counter] = $[]; + + lic_lang = ""; + list <string> available_langs = []; + string license_ident = ""; + map <string, string> tmp_licenses = $[]; + + symbol init_ret = InitLicenseData (nil, dir, tmp_licenses, available_langs, require_agreement, license_ident, dir); + + if (license_ident != nil) + license_idents = add (license_idents, license_ident); + + term license_term = GetLicenseDialog (available_langs, lic_lang, tmp_licenses, dir, true); + if (license_term == nil) { + y2error ("Oops, license term is: %1", license_term); + } else { + contents = add (contents, license_term); + } + + // Display info as a popup if exists + if (info_file != nil) + InstShowInfo::show_info_txt (info_file); + + licenses[counter] = tmp_licenses; + + if (AcceptanceNeeded (dir)) + default_next_button_state = false; + }); + + SCR::Write (.target.ycp, "/tmp/a", contents); + Wizard::SetContents(caption, contents, GetLicenseDialogHelp(), + enable_back, default_next_button_state); + + Wizard::SetTitleIcon ("yast-license"); + Wizard::SetFocusToNextButton(); + + // set timeout for autoinstallation + // bugzilla #206706 + if (Mode::autoinst()) { + y2milestone("AutoYaST: License has been accepted automatically"); + ret = `accepted; + } else { + foreach (map <string, string> tmp_licenses, licenses, { + symbol tmp_ret = HandleLicenseDialogRet (tmp_licenses, base_product, action); + }); + } + + // store already accepted license IDs + if (ret == `accepted) { + foreach (string license_ident, license_idents, { + LicenseHasBeenAccepted (license_ident); + }); + } + + CleanUpLicense (tmpdir); + + // bugzilla #303922 + if (created_new_dialog || !Stage::initial()) { + Wizard::CloseDialog(); + } + + return ret; +} + global symbol AskAddOnLicenseAgreement (integer src_id) { return AskLicenseAgreement (src_id, "", license_patterns, @@ -1091,7 +1220,7 @@ symbol init_ret = InitLicenseData (nil /* base product */, "", licenses, available_langs, true, license_ident, tostring (src_id)); - term rt = GetLicenseContent (lic_lang, licenses); + term rt = GetLicenseContent (lic_lang, licenses, tostring (src_id)); UI::ReplaceWidget (`id (replace_point_ID), rt); string id = tostring (src_id); @@ -1109,11 +1238,15 @@ return true; } -global symbol AskInstalledLicenseAgreement (string directory, - list<string> patterns, string action, string id) -{ - return AskLicenseAgreement (nil, directory, patterns, action, false, true, false, id); +global symbol AskInstalledLicenseAgreement (string directory, string action) { + // patterns are hard-coded + return AskLicenseAgreement (nil, directory, [], action, false, true, false, directory); } +// FATE #306295: More licenses in one dialog +global symbol AskInstalledLicensesAgreement (list <string> directories, string action) { + // patterns are hard-coded + return AskLicensesAgreement (directories, [], action, false, true, false); +} } // EOF -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60123 - /branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: locilka Date: Wed Dec 16 15:41:32 2009 New Revision: 60123 URL: http://svn.opensuse.org/viewcvs/yast?rev=60123&view=rev Log: Continuing with multi-license dialog Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Wed Dec 16 15:41:32 2009 @@ -139,7 +139,7 @@ return license_file; } -global term GetLicenseContent (string lic_lang, map <string, string> & licenses) { +global term GetLicenseContent (string lic_lang, map <string, string> & licenses, string id) { string license_file = WhichLicenceFile (lic_lang, licenses); string license_text = (string) SCR::Read(.target.string, license_file); @@ -152,13 +152,13 @@ // License is HTML (or RichText) if (regexpmatch(license_text, "</.*>")) - rt = `MinWidth (80, `RichText(`id (`welcome_text), + rt = `MinWidth (80, `RichText(`id (sformat("welcome_text_%1", id)), license_text )); // License is plain text // details in BNC #449188 else - rt = `MinWidth (80, `RichText(`id (`welcome_text), + rt = `MinWidth (80, `RichText(`id (sformat("welcome_text_%1", id)), "<pre>" + String::EscapeTags (license_text) + "</pre>" )); @@ -171,7 +171,7 @@ term GetLicenseDialogTerm (list<string> languages, string license_language, map <string, string> & licenses, string id) { string license_text = ""; - term rt = GetLicenseContent (license_language, licenses); + term rt = GetLicenseContent (license_language, licenses, id); // bug #204791, no more "languages.ycp" client map<string,list> lang_names_orig = Language::GetLanguagesMap (false); @@ -285,29 +285,22 @@ } } -/** - * Displays License with Help and ( ) Yes / ( ) No radio buttons - * @param string file with the license - */ -void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map <string, string> & licenses, string id) { +term GetLicenseDialog (list<string> languages, string license_language, map <string, string> & licenses, string id, boolean spare_space) { map display = UI::GetDisplayInfo(); integer space = display["TextMode"]:true ? 1 : 3; - // dialog caption - string caption = _("License Agreement"); - term license_buttons = `VBox ( - `VSpacing (2), - `RadioButtonGroup(`id(`eula), + `VSpacing ((spare_space ? 0:2)), + `RadioButtonGroup(`id (sformat ("eula_%1", id)), `HBox( `HSpacing (2*space), `VBox( - `Left(`RadioButton(`id(`yes), + `Left(`RadioButton(`id (sformat("yes_%1", id)), `opt(`notify), // radio button _("&Yes, I Agree to the License Agreement") )), - `Left(`RadioButton(`id(`no), + `Left(`RadioButton(`id (sformat("no_%1", id)), `opt(`notify), // radio button _("N&o, I Do Not Agree") @@ -318,8 +311,8 @@ ) ); - term contents = `VBox ( - `VSpacing (1), + return `VBox ( + `VSpacing ((spare_space ? 0:1)), `HBox ( `HSpacing (2*space), GetLicenseDialogTerm (languages, license_language, licenses, id), @@ -333,7 +326,7 @@ : `Empty() ), - `VSpacing(1), + `VSpacing((spare_space ? 0.5 : 1)), `HBox ( `HSpacing (2*space), (license_file_print != nil ? @@ -351,22 +344,35 @@ ), `HSpacing (2*space) ), - `VSpacing (1) + `VSpacing ((spare_space ? 0:1)) ); +} +string GetLicenseDialogHelp () { // help text - string help = _("Read the license agreement carefully and select + return _("Read the license agreement carefully and select one of the available options. If you do not agree to the license agreement, the configuration will be aborted. "); +} + +/** + * Displays License with Help and ( ) Yes / ( ) No radio buttons + * @param string file with the license + */ +void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map <string, string> & licenses, string id) { + // dialog caption + string caption = _("License Agreement"); + + term contents = GetLicenseDialog (languages, license_language, licenses, id, false); // If acceptance is not needed, there's no need to disable the button // by default boolean default_next_button_state = (AcceptanceNeeded (id) ? false : true); - Wizard::SetContents(caption, contents, help, + Wizard::SetContents(caption, contents, GetLicenseDialogHelp(), back, default_next_button_state); - + Wizard::SetTitleIcon ("yast-license"); Wizard::SetFocusToNextButton(); } @@ -771,7 +777,7 @@ lic_lang = (string) UI::QueryWidget (`id (sformat ("license_language_%1", id)), `Value); term rp_id = `id (sformat ("license_contents_rp_%1", id)); if (UI::WidgetExists (rp_id)) { - UI::ReplaceWidget (rp_id, GetLicenseContent (lic_lang, licenses)); + UI::ReplaceWidget (rp_id, GetLicenseContent (lic_lang, licenses, id)); } else { y2error ("No such widget: %1", rp_id); } @@ -794,7 +800,7 @@ } // All licenses have to be accepted - if ((symbol) UI::QueryWidget(`id (eula_id), `CurrentButton) != `yes) { + if (regexpmatch ((string) UI::QueryWidget(`id (eula_id), `CurrentButton), "^yes_")) { accepted = false; break; } @@ -816,9 +822,9 @@ y2error ("Widget %1 does not exist", eula_id); } - symbol current_button = (symbol) UI::QueryWidget(`id (eula_id), `CurrentButton); + string current_button = (string) UI::QueryWidget(`id (eula_id), `CurrentButton); // license have to be accepted or declined - if (current_button != `yes && current_button != `no) { + if (current_button == nil) { y2warning ("License %1 hasn't been accepted or declined", eula_id); ret = false; break; @@ -840,7 +846,7 @@ ret = `language; // bugzilla #303828 // disabled next button unless yes/no is selected - } else if (ret == `yes || ret == `no) { + } else if (is (ret, string) && (regexpmatch (tostring(ret), "^yes_") || regexpmatch (tostring(ret), "^no_"))) { if (AllLicensesAcceptedOrDeclined()) Wizard::EnableNextButton(); } @@ -1017,6 +1023,129 @@ return ret; } +/** + * Ask user to confirm license agreement + * @param src_id integer repository to get the license from. + * If set to 'nil', the license is considered to belong to a base product + * @param list <string> dirs - directories to look for the licenses + * @param patterns a list of patterns for the files, regular expressions + * with %1 for the language + * @param boolean enable_back sets the back_button status + * @param boolean base_product defines whether it is a base or add-on product + * true means base product, false add-on product + * @param require_agreement means that even if the license (or the very same license) + * has been already accepetd, ask user to accept it again (because of 'going back' + * in the installation proposal). + */ +global symbol AskLicensesAgreement (list <string> dirs, + list<string> patterns, string action, boolean enable_back, + boolean base_product, boolean require_agreement) +{ + if (dirs == nil || dirs == []) { + y2error ("No directories: %1", dirs); + // error message + Report::Error ("Internal Error: No license to show"); + return `auto; + } + + symbol init_ret = nil; + + if (init_ret == `auto || init_ret == `accepted) { + y2milestone ("Returning %1", init_ret); + return init_ret; + } + + boolean created_new_dialog = false; + + // #459391 + // If a progress is running open another dialog + if (Progress::IsRunning()) { + y2milestone ("Some progress is running, opening new dialog for license..."); + Wizard::OpenNextBackDialog(); + created_new_dialog = true; + } + + // dialog caption + string caption = _("License Agreement"); + + list <string> license_idents = []; + + // initial loop + symbol ret = nil; + + list <map <string, string> > licenses = []; + integer counter = -1; + term contents = `VBox(); + // If acceptance is not needed, there's no need to disable the button + // by default + boolean default_next_button_state = true; + + foreach (string dir, dirs, { + counter = counter + 1; + licenses[counter] = $[]; + + lic_lang = ""; + list <string> available_langs = []; + string license_ident = ""; + map <string, string> tmp_licenses = $[]; + + symbol init_ret = InitLicenseData (nil, dir, tmp_licenses, available_langs, require_agreement, license_ident, dir); + + if (license_ident != nil) + license_idents = add (license_idents, license_ident); + + term license_term = GetLicenseDialog (available_langs, lic_lang, tmp_licenses, dir, true); + if (license_term == nil) { + y2error ("Oops, license term is: %1", license_term); + } else { + contents = add (contents, license_term); + } + + // Display info as a popup if exists + if (info_file != nil) + InstShowInfo::show_info_txt (info_file); + + licenses[counter] = tmp_licenses; + + if (AcceptanceNeeded (dir)) + default_next_button_state = false; + }); + + SCR::Write (.target.ycp, "/tmp/a", contents); + Wizard::SetContents(caption, contents, GetLicenseDialogHelp(), + enable_back, default_next_button_state); + + Wizard::SetTitleIcon ("yast-license"); + Wizard::SetFocusToNextButton(); + + // set timeout for autoinstallation + // bugzilla #206706 + if (Mode::autoinst()) { + y2milestone("AutoYaST: License has been accepted automatically"); + ret = `accepted; + } else { + foreach (map <string, string> tmp_licenses, licenses, { + symbol tmp_ret = HandleLicenseDialogRet (tmp_licenses, base_product, action); + }); + } + + // store already accepted license IDs + if (ret == `accepted) { + foreach (string license_ident, license_idents, { + LicenseHasBeenAccepted (license_ident); + }); + } + + CleanUpLicense (tmpdir); + + // bugzilla #303922 + if (created_new_dialog || !Stage::initial()) { + Wizard::CloseDialog(); + } + + return ret; +} + global symbol AskAddOnLicenseAgreement (integer src_id) { return AskLicenseAgreement (src_id, "", license_patterns, @@ -1091,7 +1220,7 @@ symbol init_ret = InitLicenseData (nil /* base product */, "", licenses, available_langs, true, license_ident, tostring (src_id)); - term rt = GetLicenseContent (lic_lang, licenses); + term rt = GetLicenseContent (lic_lang, licenses, tostring (src_id)); UI::ReplaceWidget (`id (replace_point_ID), rt); string id = tostring (src_id); @@ -1109,11 +1238,15 @@ return true; } -global symbol AskInstalledLicenseAgreement (string directory, - list<string> patterns, string action, string id) -{ - return AskLicenseAgreement (nil, directory, patterns, action, false, true, false, id); +global symbol AskInstalledLicenseAgreement (string directory, string action) { + // patterns are hard-coded + return AskLicenseAgreement (nil, directory, [], action, false, true, false, directory); } +// FATE #306295: More licenses in one dialog +global symbol AskInstalledLicensesAgreement (list <string> directories, string action) { + // patterns are hard-coded + return AskLicensesAgreement (directories, [], action, false, true, false); +} } // EOF -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0