January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60314 - in /trunk/country: VERSION keyboard/src/modules/Keyboard.ycp package/yast2-country.changes
by jsuchome＠svn.opensuse.org 11 Jan '10

11 Jan '10

Author: jsuchome Date: Mon Jan 11 15:42:17 2010 New Revision: 60314 URL: http://svn.opensuse.org/viewcvs/yast?rev=60314&view=rev Log: - do not call setxkbmap if running over ssh (bnc#539218) - 2.19.7 Modified: trunk/country/VERSION trunk/country/keyboard/src/modules/Keyboard.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=60314&r1=603… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Mon Jan 11 15:42:17 2010 @@ -1 +1 @@ -2.19.6 +2.19.7 Modified: trunk/country/keyboard/src/modules/Keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/modules/Key… ============================================================================== --- trunk/country/keyboard/src/modules/Keyboard.ycp (original) +++ trunk/country/keyboard/src/modules/Keyboard.ycp Mon Jan 11 15:42:17 2010 @@ -1072,10 +1072,16 @@ map display_info = UI::GetDisplayInfo (); textmode = display_info["TextMode"]:false; } + string display = getenv ("DISPLAY"); if (textmode) { y2milestone("Not setting X keyboard due to text mode"); } + // check if we are running over ssh: bnc#539218,c4 + else if (tointeger (splitstring (display, ":")[1]:"0") >= 10) + { + y2milestone("Not setting X keyboard: running over ssh"); + } else if (size (xkb_cmd)>0) { SetKeyboard (keyboard); Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Mon Jan 11 15:42:17 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 11 15:27:15 CET 2010 - jsuchome(a)suse.cz + +- do not call setxkbmap if running over ssh (bnc#539218) +- 2.19.7 + +------------------------------------------------------------------- Fri Jan 8 10:09:52 CET 2010 - jsuchome(a)suse.cz - package keyboard desktop file -- 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] r60313 - in /branches/SuSE-Code-11-SP1-Branch/country: VERSION keyboard/src/modules/Keyboard.ycp package/yast2-country.changes
by jsuchome＠svn.opensuse.org 11 Jan '10

11 Jan '10

Author: jsuchome Date: Mon Jan 11 15:42:08 2010 New Revision: 60313 URL: http://svn.opensuse.org/viewcvs/yast?rev=60313&view=rev Log: - do not call setxkbmap if running over ssh (bnc#539218) - 2.17.41 Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION branches/SuSE-Code-11-SP1-Branch/country/keyboard/src/modules/Keyboard.ycp branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/count… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/country/VERSION Mon Jan 11 15:42:08 2010 @@ -1 +1 @@ -2.17.40 +2.17.41 Modified: branches/SuSE-Code-11-SP1-Branch/country/keyboard/src/modules/Keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/count… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/keyboard/src/modules/Keyboard.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/country/keyboard/src/modules/Keyboard.ycp Mon Jan 11 15:42:08 2010 @@ -1136,10 +1136,16 @@ map display_info = UI::GetDisplayInfo (); textmode = display_info["TextMode"]:false; } + string display = getenv ("DISPLAY"); if (textmode) { y2milestone("Not setting X keyboard due to text mode"); } + // check if we are running over ssh: bnc#539218,c4 + else if (tointeger (splitstring (display, ":")[1]:"0") >= 10) + { + y2milestone("Not setting X keyboard: running over ssh"); + } else if (size (xkb_cmd)>0) { SetKeyboard (keyboard); Modified: branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/count… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes Mon Jan 11 15:42:08 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 11 15:29:12 CET 2010 - jsuchome(a)suse.cz + +- do not call setxkbmap if running over ssh (bnc#539218) +- 2.17.41 + +------------------------------------------------------------------- Thu Jan 7 14:45:07 CET 2010 - jsuchome(a)suse.cz - added Language::SwitchToEnglishIfNeeded to be called when it might -- 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] r60312 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 11 Jan '10

11 Jan '10

Author: rhafer Date: Mon Jan 11 14:47:10 2010 New Revision: 60312 URL: http://svn.opensuse.org/viewcvs/yast?rev=60312&view=rev Log: 2.17.28 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 Mon Jan 11 14:47:10 2010 @@ -1 +1 @@ -2.17.27 +2.17.28 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 Mon Jan 11 14:47:10 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 11 13:21:12 UTC 2010 - rhafer(a)novell.com + +- Version 2.17.28 +- added online help for replication configuration (bnc#557967) + +------------------------------------------------------------------- Wed Dec 16 15:31:42 UTC 2009 - rhafer(a)novell.com - Version 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] r60311 - /tags/branch-Code-11-SP1-2_17_67/bootloader/
by juhliarik＠svn.opensuse.org 11 Jan '10

11 Jan '10

Author: juhliarik Date: Mon Jan 11 14:31:29 2010 New Revision: 60311 URL: http://svn.opensuse.org/viewcvs/yast?rev=60311&view=rev Log: Created tag branch-Code-11-SP1-2_17_67 for bootloader Added: tags/branch-Code-11-SP1-2_17_67/bootloader/ (props changed) - copied from r60310, branches/SuSE-Code-11-SP1-Branch/bootloader/ -- 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] r60310 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes src/modules/BootCommon.ycp
by juhliarik＠svn.opensuse.org 11 Jan '10

11 Jan '10

Author: juhliarik Date: Mon Jan 11 14:31:20 2010 New Revision: 60310 URL: http://svn.opensuse.org/viewcvs/yast?rev=60310&view=rev Log: added fix for deleting gfxmenu if serial console is configured bnc#568295 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Mon Jan 11 14:31:20 2010 @@ -1 +1 @@ -2.17.66 +2.17.67 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Mon Jan 11 14:31:20 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 11 13:18:28 CET 2010 - juhliarik(a)suse.cz + +- added fix for deleting gfxmenu if serial console is used + (bnc#568295) +- 2.17.67 + +------------------------------------------------------------------- Thu Jan 7 14:57:34 CET 2010 - juhliarik(a)suse.cz - added fix for data in device.map if MD RAID from Intel is used Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp Mon Jan 11 14:31:20 2010 @@ -851,6 +851,34 @@ y2error ("No generic propose function available"); } +/** bnc# 346576,568295 - Bootloader configuration doesn't work for serial output + * Function check if settings need to remove gfxmenu + * + * @return boolean - true if gfxmenu needs to be removed + */ + +boolean removeGFXMenu () +{ + if ((globals["trusted_grub"]:"" == "true") && (haskey(globals, "gfxmenu"))) + { + y2milestone("Remove gfxmenu -> selected trusted grub"); + return true; + } + + if ((globals["serial"]:nil != "") && (globals["serial"]:nil != nil) && (haskey(globals, "gfxmenu"))) + { + y2milestone("Remove gfxmenu -> defined serial console"); + return true; + } + + if ((globals["gfxmenu"]:"" == "none") && (haskey(globals, "gfxmenu"))) + { + y2milestone("Remove gfxmenu -> disabled gfxmenu"); + return true; + } + return false; +} + /** * Save all bootloader configuration files to the cache of the PlugLib * PlugLib must be initialized properly !!! @@ -908,7 +936,8 @@ return $[BootCommon::Dev2MountByDev(k) : v]; }); y2milestone ("device map after mapping %1", my_device_mapping); - if ((globals["trusted_grub"]:"" == "true") && (haskey(globals, "gfxmenu"))) + + if (removeGFXMenu()) globals = remove(globals, "gfxmenu"); // convert XEN section to linux section id running in domU -- 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] r60309 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp
by rhafer＠svn.opensuse.org 11 Jan '10

11 Jan '10

Author: rhafer Date: Mon Jan 11 14:20:24 2010 New Revision: 60309 URL: http://svn.opensuse.org/viewcvs/yast?rev=60309&view=rev Log: more for online-help Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp Mon Jan 11 14:20:24 2010 @@ -136,7 +136,7 @@ "syncprov_edit" : _("<h3>Replication Provider Settings</h3>") + - _("<p>Check the <b>Enable ldapsync provider for this database</b> checkbox, if you want to + _("<p>Select the \"<b>Enable ldapsync provider for this database</b>\" checkbox, if you want to be able to replicate the currently selected database to another server.</p>") + _("<h4>Checkpoint Settings</h4>") + _("<p>Here you can specify how often the synchronization state indicator (stored in the @@ -154,6 +154,8 @@ "synccons_edit" : _("<h3>Replication Consumer Settings</h3>") + + _("<p>Select the \"<b>This database is a Replication Consumer</b>\" if you want the database to be a replica +of a database on another server.</p>") + _("<h4>Provider</h4>") + _("Enter the connection details for the replication connection to the master server here. For that, select the protocol to use (<b>ldap</b> or <b>ldaps</b>) and enter the fully qualified hostname of the master server here. It is -- 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] r60308 - /tags/branch-Code-11-SP1-2_17_67/packager/
by locilka＠svn.opensuse.org 11 Jan '10

11 Jan '10

Author: locilka Date: Mon Jan 11 13:59:50 2010 New Revision: 60308 URL: http://svn.opensuse.org/viewcvs/yast?rev=60308&view=rev Log: Created tag branch-Code-11-SP1-2_17_67 for packager Added: tags/branch-Code-11-SP1-2_17_67/packager/ (props changed) - copied from r60307, branches/SuSE-Code-11-SP1-Branch/packager/ -- 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] r60307 - /tags/branch-Code-11-SP1-2_17_67/
by locilka＠svn.opensuse.org 11 Jan '10

11 Jan '10

Author: locilka Date: Mon Jan 11 13:59:49 2010 New Revision: 60307 URL: http://svn.opensuse.org/viewcvs/yast?rev=60307&view=rev Log: Created tag branch-Code-11-SP1-2_17_67 Added: tags/branch-Code-11-SP1-2_17_67/ -- 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] r60306 - in /trunk/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 11 Jan '10

11 Jan '10

Author: locilka Date: Mon Jan 11 13:59:20 2010 New Revision: 60306 URL: http://svn.opensuse.org/viewcvs/yast?rev=60306&view=rev Log: - Fixed switching license language in ProductLicense. - Fixed disabled Next button while showing license with no acceptance needed in ProductLicense. Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Jan 11 13:59:20 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 11 13:57:26 CET 2010 - locilka(a)suse.cz + +- Fixed switching license language in ProductLicense. +- Fixed disabled Next button while showing license with no + acceptance needed in ProductLicense. + +------------------------------------------------------------------- Fri Jan 8 08:05:12 UTC 2010 - lslezak(a)suse.cz - don't display exact total remaining time when there is an 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 Mon Jan 11 13:59:20 2010 @@ -45,6 +45,12 @@ list <string> license_ids = []; /** + * License files by their eula_ID + * @struct $["ID":$[licenses]] + */ +map <string, map <string, string> > all_licenses = $[]; + +/** * Checks the string that might contain ID of a license and * eventually returns that id. * See also GetIdPlease for a better ratio of successful stories. @@ -52,8 +58,8 @@ string GetId (string id_text) { string id = nil; - if (regexpmatch (id_text, "^license_language_[[:digit:]]+")) { - id = regexpsub (id_text, "^license_language_([[:digit:]]+)", "\\1"); + if (regexpmatch (id_text, "^license_language_.+")) { + id = regexpsub (id_text, "^license_language_(.+)", "\\1"); } else { y2error ("Cannot get ID from %1", id_text); } @@ -671,6 +677,10 @@ licenses = LicenseFiles (license_dir, license_patterns); + + // all other 'licenses' could be replaced by this one + all_licenses[id] = licenses; + if (info_file == nil && size (licenses) == 0) return `auto; @@ -776,6 +786,11 @@ // read the selected language lic_lang = (string) UI::QueryWidget (`id (sformat ("license_language_%1", id)), `Value); term rp_id = `id (sformat ("license_contents_rp_%1", id)); + + if (licenses == $[]) { + licenses = all_licenses[id]:$[]; + } + if (UI::WidgetExists (rp_id)) { UI::ReplaceWidget (rp_id, GetLicenseContent (lic_lang, licenses, id)); } else { @@ -819,7 +834,7 @@ string eula_id = nil; foreach (string one_license_id, license_ids, { - if (AcceptanceNeeded (one_license_id)) + if (AcceptanceNeeded (one_license_id) != true) return; eula_id = sformat ("eula_%1", one_license_id); @@ -842,11 +857,10 @@ symbol HandleLicenseDialogRet (map <string, string> & licenses, boolean base_product, string action) { any ret = nil; - while (true) - { + while (true) { ret = UI::UserInput(); - if (is (ret, string) && regexpmatch (tostring (ret), "^license_language_[[:digit:]]+$")) { + if (is (ret, string) && regexpmatch (tostring (ret), "^license_language_")) { UpdateLicenseContent (licenses, GetId (tostring (ret))); ret = `language; // bugzilla #303828 @@ -854,10 +868,8 @@ } else if (is (ret, string) && (regexpmatch (tostring(ret), "^yes_") || regexpmatch (tostring(ret), "^no_"))) { if (AllLicensesAcceptedOrDeclined()) Wizard::EnableNextButton(); - } - // Aborting the license dialog - if (ret == `abort) { + } else if (ret == `abort) { // bugzilla #218677 if (base_product) { if (Popup::ConfirmAbort (`painless)) { @@ -873,9 +885,7 @@ break; } } - } - else if (ret == `next) - { + } else if (ret == `next) { // License declined if (AllLicensesAccepted() != true) { @@ -941,11 +951,11 @@ ret = `accepted; break; } - } - else if (ret == `back) - { + } else if (ret == `back) { ret = `back; break; + } else { + y2error ("Unhandled input: %1", ret); } } -- 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] r60305 - in /branches/SuSE-Code-11-SP1-Branch/packager: VERSION package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 11 Jan '10

11 Jan '10

Author: locilka Date: Mon Jan 11 13:59:06 2010 New Revision: 60305 URL: http://svn.opensuse.org/viewcvs/yast?rev=60305&view=rev Log: - Fixed switching license language in ProductLicense. - Fixed disabled Next button while showing license with no acceptance needed in ProductLicense. - 2.17.67 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Mon Jan 11 13:59:06 2010 @@ -1 +1 @@ -2.17.66 +2.17.67 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Mon Jan 11 13:59:06 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Jan 11 13:57:26 CET 2010 - locilka(a)suse.cz + +- Fixed switching license language in ProductLicense. +- Fixed disabled Next button while showing license with no + acceptance needed in ProductLicense. +- 2.17.67 + +------------------------------------------------------------------- Thu Jan 7 12:16:03 UTC 2010 - lslezak(a)suse.cz - pass the selected CD/DVD device to the package manager in case 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 Mon Jan 11 13:59:06 2010 @@ -45,6 +45,12 @@ list <string> license_ids = []; /** + * License files by their eula_ID + * @struct $["ID":$[licenses]] + */ +map <string, map <string, string> > all_licenses = $[]; + +/** * Checks the string that might contain ID of a license and * eventually returns that id. * See also GetIdPlease for a better ratio of successful stories. @@ -52,8 +58,8 @@ string GetId (string id_text) { string id = nil; - if (regexpmatch (id_text, "^license_language_[[:digit:]]+")) { - id = regexpsub (id_text, "^license_language_([[:digit:]]+)", "\\1"); + if (regexpmatch (id_text, "^license_language_.+")) { + id = regexpsub (id_text, "^license_language_(.+)", "\\1"); } else { y2error ("Cannot get ID from %1", id_text); } @@ -671,6 +677,10 @@ licenses = LicenseFiles (license_dir, license_patterns); + + // all other 'licenses' could be replaced by this one + all_licenses[id] = licenses; + if (info_file == nil && size (licenses) == 0) return `auto; @@ -776,6 +786,11 @@ // read the selected language lic_lang = (string) UI::QueryWidget (`id (sformat ("license_language_%1", id)), `Value); term rp_id = `id (sformat ("license_contents_rp_%1", id)); + + if (licenses == $[]) { + licenses = all_licenses[id]:$[]; + } + if (UI::WidgetExists (rp_id)) { UI::ReplaceWidget (rp_id, GetLicenseContent (lic_lang, licenses, id)); } else { @@ -819,7 +834,7 @@ string eula_id = nil; foreach (string one_license_id, license_ids, { - if (AcceptanceNeeded (one_license_id)) + if (AcceptanceNeeded (one_license_id) != true) return; eula_id = sformat ("eula_%1", one_license_id); @@ -842,11 +857,10 @@ symbol HandleLicenseDialogRet (map <string, string> & licenses, boolean base_product, string action) { any ret = nil; - while (true) - { + while (true) { ret = UI::UserInput(); - if (is (ret, string) && regexpmatch (tostring (ret), "^license_language_[[:digit:]]+$")) { + if (is (ret, string) && regexpmatch (tostring (ret), "^license_language_")) { UpdateLicenseContent (licenses, GetId (tostring (ret))); ret = `language; // bugzilla #303828 @@ -854,10 +868,8 @@ } else if (is (ret, string) && (regexpmatch (tostring(ret), "^yes_") || regexpmatch (tostring(ret), "^no_"))) { if (AllLicensesAcceptedOrDeclined()) Wizard::EnableNextButton(); - } - // Aborting the license dialog - if (ret == `abort) { + } else if (ret == `abort) { // bugzilla #218677 if (base_product) { if (Popup::ConfirmAbort (`painless)) { @@ -873,9 +885,7 @@ break; } } - } - else if (ret == `next) - { + } else if (ret == `next) { // License declined if (AllLicensesAccepted() != true) { @@ -941,11 +951,11 @@ ret = `accepted; break; } - } - else if (ret == `back) - { + } else if (ret == `back) { ret = `back; break; + } else { + y2error ("Unhandled input: %1", ret); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0