January 2010 - YaST Commits - openSUSE Mailing Lists

[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

[yast-commit] r60304 - /tags/stable-2_19_2/firstboot/
by jsuchome＠svn.opensuse.org 11 Jan '10

11 Jan '10

Author: jsuchome Date: Mon Jan 11 10:10:59 2010 New Revision: 60304 URL: http://svn.opensuse.org/viewcvs/yast?rev=60304&view=rev Log: Created tag stable-2_19_2 for firstboot Added: tags/stable-2_19_2/firstboot/ - copied from r60303, trunk/firstboot/ -- 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] r60303 - in /trunk/firstboot: VERSION package/yast2-firstboot.changes src/firstboot_write.ycp
by jsuchome＠svn.opensuse.org 11 Jan '10

11 Jan '10

Author: jsuchome Date: Mon Jan 11 10:10:48 2010 New Revision: 60303 URL: http://svn.opensuse.org/viewcvs/yast?rev=60303&view=rev Log: - set the displaymanager only when respective package is installed (bnc#538998) - 2.19.2 Modified: trunk/firstboot/VERSION trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/firstboot_write.ycp Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=60303&r1=6… ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Mon Jan 11 10:10:48 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Mon Jan 11 10:10:48 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 11 10:02:39 CET 2010 - jsuchome(a)suse.cz + +- set the displaymanager only when respective package is installed + (bnc#538998) +- 2.19.2 + +------------------------------------------------------------------- Thu Jan 7 14:34:43 CET 2010 - jsuchome(a)suse.cz - added firstboot_licenses step able to show 2 license texts Modified: trunk/firstboot/src/firstboot_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_write.yc… ============================================================================== --- trunk/firstboot/src/firstboot_write.ycp (original) +++ trunk/firstboot/src/firstboot_write.ycp Mon Jan 11 10:10:48 2010 @@ -12,6 +12,7 @@ import "FileUtils"; import "Firstboot"; import "Keyboard"; + import "Package"; import "Popup"; import "Progress"; import "Wizard"; @@ -63,9 +64,11 @@ { default_dm = "gdm"; } - SCR::Write( - .sysconfig.displaymanager.DISPLAYMANAGER, default_dm - ); + if ((default_dm == "kdm" && Package::Installed ("kdm")) || + (default_dm == "gdm" && Package::Installed ("gdm"))) + { + SCR::Write (.sysconfig.displaymanager.DISPLAYMANAGER, default_dm); + } SCR::Write( .sysconfig.windowmanager.DEFAULT_WM, Firstboot::default_wm ); -- 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] r60302 - /tags/branch-Code-11-2_17_39_1/pkg-bindings/
by lslezak＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: lslezak Date: Fri Jan 8 18:11:11 2010 New Revision: 60302 URL: http://svn.opensuse.org/viewcvs/yast?rev=60302&view=rev Log: Created tag branch-Code-11-2_17_39_1 for pkg-bindings Added: tags/branch-Code-11-2_17_39_1/pkg-bindings/ - copied from r60301, branches/SuSE-Code-11-Branch/pkg-bindings/ -- 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] r60301 - /tags/branch-Code-11-2_17_39_1/
by lslezak＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: lslezak Date: Fri Jan 8 18:11:08 2010 New Revision: 60301 URL: http://svn.opensuse.org/viewcvs/yast?rev=60301&view=rev Log: Created tag branch-Code-11-2_17_39_1 Added: tags/branch-Code-11-2_17_39_1/ -- 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] r60300 - in /branches/SuSE-Code-11-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Resolvable_Properties.cc yast2-pkg-bindings.spec.in
by lslezak＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: lslezak Date: Fri Jan 8 18:11:04 2010 New Revision: 60300 URL: http://svn.opensuse.org/viewcvs/yast?rev=60300&view=rev Log: - Pkg::ResolvableProperties() - return product file and it's upgrades section for `product resolvables (bnc#559554) - 2.17.39.1 Modified: branches/SuSE-Code-11-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-Branch/pkg-bindings/src/Resolvable_Properties.cc branches/SuSE-Code-11-Branch/pkg-bindings/yast2-pkg-bindings.spec.in Modified: branches/SuSE-Code-11-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/VERSION Fri Jan 8 18:11:04 2010 @@ -1 +1 @@ -2.17.39 +2.17.39.1 Modified: branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Fri Jan 8 18:11:04 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 8 13:00:43 UTC 2010 - lslezak(a)suse.cz + +- Pkg::ResolvableProperties() - return product file and it's + upgrades section for `product resolvables (bnc#559554) +- 2.17.39.1 + +------------------------------------------------------------------- Fri Jul 10 11:18:04 CEST 2009 - lslezak(a)suse.cz - clean existing cache for added repositories, do not reuse Modified: branches/SuSE-Code-11-Branch/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/src/Resolvable_Properties.cc (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/src/Resolvable_Properties.cc Fri Jan 8 18:11:04 2010 @@ -45,6 +45,8 @@ #include <zypp/Dep.h> #include <zypp/sat/LocaleSupport.h> +#include <zypp/parser/ProductFileReader.h> +#include <zypp/base/Regex.h> /** @builtin ResolvableProperties @@ -89,6 +91,13 @@ + "description" + "display_name" + "short_name" + + "product_file" -> string : product file (full file name with target root prefix) + + "upgrades" -> list<map> : parsed data from the product file (upgrades section) + + "name" -> string + + "summary" -> string + + "repository" -> string : URL path + + "notify" -> boolean + + "status" -> string `patch keys: + "interactive" + "reboot_needed" @@ -370,6 +379,75 @@ info->add(YCPString("replaces"), rep_prods); } + + std::string product_file; + + // add reference file in /etc/products.d + if (status.isInstalled()) + { + product_file = (_target_root + "/etc/products.d/" + product->referenceFilename()).asString(); + y2milestone("Parsing product file %s", product_file.c_str()); + const zypp::parser::ProductFileData productFileData = zypp::parser::ProductFileReader::scanFile(product_file); + + YCPList upgrade_list; + + for_( upit, productFileData.upgrades().begin(), productFileData.upgrades().end() ) + { + const zypp::parser::ProductFileData::Upgrade & upgrade( *upit ); + + YCPMap upgrades; + upgrades->add(YCPString("name"), YCPString(upgrade.name())); + upgrades->add(YCPString("summary"), YCPString(upgrade.summary())); + upgrades->add(YCPString("repository"), YCPString(upgrade.repository())); + upgrades->add(YCPString("notify"), YCPBoolean(upgrade.notify())); + upgrades->add(YCPString("status"), YCPString(upgrade.status())); + + upgrade_list->add(upgrades); + } + + info->add(YCPString("upgrades"), upgrade_list); + } + else + { + // get the package + zypp::sat::Solvable refsolvable = product->referencePackage(); + + if (refsolvable != zypp::sat::Solvable::noSolvable) + { + // create a package pointer from the SAT solvable + zypp::Package::Ptr refpkg(zypp::make<zypp::Package>(refsolvable)); + + if (refpkg) + { + // get the package files + zypp::Package::FileList files( refpkg->filelist() ); + y2milestone("The reference package has %d files", files.size()); + + zypp::str::smatch what; + const zypp::str::regex product_file_regex("^/etc/products\\.d/(.*\\.prod)$"); + + // find the product file + for_(iter, files.begin(), files.end()) + { + if (zypp::str::regex_match(*iter, what, product_file_regex)) + { + product_file = what[1]; + break; + } + } + } + } + } + + if (product_file.empty()) + { + y2warning("The product file has not been found"); + } + else + { + y2milestone("Found product file %s", product_file.c_str()); + info->add(YCPString("product_file"), YCPString(product_file)); + } } // pattern specific info else if ( req_kind == "pattern" ) { Modified: branches/SuSE-Code-11-Branch/pkg-bindings/yast2-pkg-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/yast2-pkg-bindings.spec.in (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/yast2-pkg-bindings.spec.in Fri Jan 8 18:11:04 2010 @@ -2,10 +2,10 @@ @HEADER@ BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools -BuildRequires: libzypp-devel >= 5.24.7 +# <upgrades> section support (bnc#559554) +BuildRequires: libzypp-devel >= 5.30.21 -# new GPG callbacks -Requires: libzypp >= 5.24.7 +Requires: libzypp >= 5.30.21 Summary: - -- 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] r60299 - /tags/branch-Code-11-SP1-2_17_43/pkg-bindings/
by lslezak＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: lslezak Date: Fri Jan 8 18:07:47 2010 New Revision: 60299 URL: http://svn.opensuse.org/viewcvs/yast?rev=60299&view=rev Log: Created tag branch-Code-11-SP1-2_17_43 for pkg-bindings Added: tags/branch-Code-11-SP1-2_17_43/pkg-bindings/ (props changed) - copied from r60298, branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ -- 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] r60298 - /tags/branch-Code-11-SP1-2_17_43/
by lslezak＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: lslezak Date: Fri Jan 8 18:07:45 2010 New Revision: 60298 URL: http://svn.opensuse.org/viewcvs/yast?rev=60298&view=rev Log: Created tag branch-Code-11-SP1-2_17_43 Added: tags/branch-Code-11-SP1-2_17_43/ -- 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] r60297 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: lslezak Date: Fri Jan 8 18:07:40 2010 New Revision: 60297 URL: http://svn.opensuse.org/viewcvs/yast?rev=60297&view=rev Log: - Pkg::ResolvableProperties() - return product file and it's upgrades section for `product resolvables (bnc#559554) - 2.17.43 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION Fri Jan 8 18:07:40 2010 @@ -1 +1 @@ -2.17.42 +2.17.43 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Fri Jan 8 18:07:40 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 8 13:00:43 UTC 2010 - lslezak(a)suse.cz + +- Pkg::ResolvableProperties() - return product file and it's + upgrades section for `product resolvables (bnc#559554) +- 2.17.43 + +------------------------------------------------------------------- Wed Jan 6 17:50:26 UTC 2010 - lslezak(a)suse.cz - Pkg::ResolvableProperties() - always return "transact_by" flag, Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc Fri Jan 8 18:07:40 2010 @@ -45,6 +45,8 @@ #include <zypp/Dep.h> #include <zypp/sat/LocaleSupport.h> +#include <zypp/parser/ProductFileReader.h> +#include <zypp/base/Regex.h> /** @builtin ResolvableProperties @@ -89,6 +91,13 @@ + "description" + "display_name" + "short_name" + + "product_file" -> string : product file (full file name with target root prefix) + + "upgrades" -> list<map> : parsed data from the product file (upgrades section) + + "name" -> string + + "summary" -> string + + "repository" -> string : URL path + + "notify" -> boolean + + "status" -> string `patch keys: + "interactive" + "reboot_needed" @@ -370,6 +379,75 @@ info->add(YCPString("replaces"), rep_prods); } + + std::string product_file; + + // add reference file in /etc/products.d + if (status.isInstalled()) + { + product_file = (_target_root + "/etc/products.d/" + product->referenceFilename()).asString(); + y2milestone("Parsing product file %s", product_file.c_str()); + const zypp::parser::ProductFileData productFileData = zypp::parser::ProductFileReader::scanFile(product_file); + + YCPList upgrade_list; + + for_( upit, productFileData.upgrades().begin(), productFileData.upgrades().end() ) + { + const zypp::parser::ProductFileData::Upgrade & upgrade( *upit ); + + YCPMap upgrades; + upgrades->add(YCPString("name"), YCPString(upgrade.name())); + upgrades->add(YCPString("summary"), YCPString(upgrade.summary())); + upgrades->add(YCPString("repository"), YCPString(upgrade.repository())); + upgrades->add(YCPString("notify"), YCPBoolean(upgrade.notify())); + upgrades->add(YCPString("status"), YCPString(upgrade.status())); + + upgrade_list->add(upgrades); + } + + info->add(YCPString("upgrades"), upgrade_list); + } + else + { + // get the package + zypp::sat::Solvable refsolvable = product->referencePackage(); + + if (refsolvable != zypp::sat::Solvable::noSolvable) + { + // create a package pointer from the SAT solvable + zypp::Package::Ptr refpkg(zypp::make<zypp::Package>(refsolvable)); + + if (refpkg) + { + // get the package files + zypp::Package::FileList files( refpkg->filelist() ); + y2milestone("The reference package has %d files", files.size()); + + zypp::str::smatch what; + const zypp::str::regex product_file_regex("^/etc/products\\.d/(.*\\.prod)$"); + + // find the product file + for_(iter, files.begin(), files.end()) + { + if (zypp::str::regex_match(*iter, what, product_file_regex)) + { + product_file = what[1]; + break; + } + } + } + } + } + + if (product_file.empty()) + { + y2warning("The product file has not been found"); + } + else + { + y2milestone("Found product file %s", product_file.c_str()); + info->add(YCPString("product_file"), YCPString(product_file)); + } } // pattern specific info else if ( req_kind == "pattern" ) { -- 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] r60296 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server/src: LdapDatabase.ycp helps.ycp
by rhafer＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: rhafer Date: Fri Jan 8 17:39:49 2010 New Revision: 60296 URL: http://svn.opensuse.org/viewcvs/yast?rev=60296&view=rev Log: Replication online help (bnc#557967) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp 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 Fri Jan 8 17:39:49 2010 @@ -1945,7 +1945,7 @@ { string caption = _("Replication settings"); term contents = GetSyncConsWidget(); - Wizard::SetContentsButtons(caption, contents, HELPS["syncrepl_edit"]:"", + Wizard::SetContentsButtons(caption, contents, HELPS["synccons_edit"]:"", Label::BackButton(), Label::NextButton()); symbol ret = `next; DbSyncConsRead(-1, $[] ); 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 Fri Jan 8 17:39:49 2010 @@ -134,6 +134,47 @@ (DN, filter and Attributes) matches the entry being access. You might need to order the rules according to your needs. You can use the <b>Up</b> and <b>Down</b> buttons for that</p>"), + "syncprov_edit" : + _("<h3>Replication Provider Settings</h3>") + + _("<p>Check 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 +\"<i>contextCSN</i>\"-Attribute) is written to the database. It is synced out to the database if +\"<i>Operations</i>\" write operations or more than \"<i>Minutes</i>\" have passed since the +last time the indicator was written. By default (both values are '0') the state indicator is only +written after a clean shutdown. Writing it more often can result in faster startup times after an +unclean shutdown but might result in a small performance hit in environments with many LDAP Write +Operations.</p>")+ + _("<h4>Session log</h4>") + + _("<p>Configures an in-memory session log for recording information about write operations +made on the database. Specify how many write operation should be recorded in the session log. +Configuring a session log does only make sense when \"<i>refreshOnly</i>\" replication is used. In +such a case it can speed up replication and reduce the load on the master server.</p>"), + + "synccons_edit" : + _("<h3>Replication Consumer Settings</h3>") + + _("<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 +important to use the fully qualified hostname here to be able to verify the master server's TLS/SSL certificate. Adjust +the port number if the master server is using non-standard ldap ports.") + + _("<h4>Replication Type</h4>") + + _("<p>OpenLDAP supports different modes of replication:</p>") + + _("<p><b>refreshOnly</b>: The slave server will periodically open a new connection, trigger a +synchronization and close the connection again. The intervall how often this synchronization happens can be configured +through the <b>Replication Interval</b> settings.</p>") + + _("<p><b>refreshAndPersist</b>: The slave server will open a persistent connection to the master server for +synchronization. Updated entries on the master server are immediately sent to the slave through that connection.</p>") + + _("<h4>Authentication</h4>") + + _("<p>Specify a DN and password here that the slave server should use to authenticate against the master. +The specified DN needs to have read access to all entries in the replicated database on the master.</p>") + + _("<h4>Update Referral</h4>") + + _("<p>As the slave database is readonly. The slave server will answer write operations with an LDAP referral. +This referral by default points the client to the master server. You can configure a differen update referral here. +This is e.g. useful in a cascaded replication setup i.e. when the provider for the slave server is as slave server +itself. </p>"), + /* Read dialog help */ "read" : _("<p><b><big>Initializing LDAP Server Configuration</big></b><br>Please wait...<br></p>") + @@ -156,14 +197,24 @@ created. Click <b>Finish</b> to write that configuration and leave the LDAP Server module</p>"), - /* Configuration Startup Dialog 1/2 */ + /* Configuration Wizard Step 1 */ "service_dialog" : _("<p>With <b>Start LDAP Server Yes or No</b>, start or stop the LDAP server.</p> ") + _("<p>If <b>Yes</b> is selected, you can click <b>Next</b> to start the configuration wizard</p>")+ - /* Configuration Startup Dialog 2/2 */ _("<p>If the Firewall is enabled you can open the required network ports for OpenLDAP by checking the corresponding Checkbox.</p>"), + /* Configuration Wizard Step 2 */ + "server_type" : + _("<p>Select the type of LDAP Server you want to setup. The following scenarios are available:</p>") + + _("<p><b>Standalone Server</b>: Setup a single standalone OpenLDAP Server with no preparations for +replication</p>") + + _("<p><b>Replication Master (Provider)</b>: Create an OpenLDAP setup that is prepared to act as a master server +(provider) in a replication setup.</p>") + + _("<p><b>Replication Slave (Consumer)</b>: Setup an OpenLDAP slave server that replicates all its data, +including configuration, from a master server.</p>"), + + /* Configuration Wizard Step 3 */ "tls_dialog" : _("<h3>TLS Settings</h3>") + @@ -232,7 +283,16 @@ /* Tree Item Dialog "databases" 2/2 */ _("<p>To add a new database, press <b>Add Database...</b>.</p>") + _("<p>To delete a database, select a database from the List and press <b>Delete Database...</b>. -You can not delete the \"config\" and \"frontend\" databases.</p>") +You can not delete the \"config\" and \"frontend\" databases.</p>"), + + "master_setup_dialog" : + _("<p>Enter a password for the configuration database (\"<i>cn=config</i>\") here. This is required to make +the configuration database accessible remotely.</p>"), + + "slave_dialog" : + _("<p>To setup a slave server some details need to be queried from the master server. Please enter the master +server's hostname adjust the protocol (either \"<i>ldap</i>\" or \"<i>ldaps</i>\") and port number as needed and enter the password +for the master's configuration database (\"<i>cn=config</i>\").</p>"), ]; /* 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] r60295 - in /trunk/autoinstallation: autoyast2.spec.in src/include/autopart.ycp
by aschnell＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: aschnell Date: Fri Jan 8 15:56:17 2010 New Revision: 60295 URL: http://svn.opensuse.org/viewcvs/yast?rev=60295&view=rev Log: - removed unused parameter from function Storage::GetFreeSpace Modified: trunk/autoinstallation/autoyast2.spec.in trunk/autoinstallation/src/include/autopart.ycp Modified: trunk/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/autoyast2.spec.… ============================================================================== --- trunk/autoinstallation/autoyast2.spec.in (original) +++ trunk/autoinstallation/autoyast2.spec.in Fri Jan 8 15:56:17 2010 @@ -14,6 +14,7 @@ Requires: yast2-core yast2-xml libxslt Requires: autoyast2-installation = %{version} Requires: yast2-schema yast2 yast2-country yast2-storage +Requires: yast2-storage >= 2.19.2 Provides: yast2-module-autoinst yast2-config-autoinst Obsoletes: yast2-module-autoinst yast2-config-autoinst Modified: trunk/autoinstallation/src/include/autopart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/aut… ============================================================================== --- trunk/autoinstallation/src/include/autopart.ycp (original) +++ trunk/autoinstallation/src/include/autopart.ycp Fri Jan 8 15:56:17 2010 @@ -1393,8 +1393,7 @@ if( Partitions::IsDosPartition( fsid ) ) { integer psize = (p["region",0]:0 + p["region",1]:1 - 1) * cyl_size; - win = Storage::GetFreeSpace( p["device"]:"", psize, `fat32, - false ); + win = Storage::GetFreeSpace( p["device"]:"", `fat32, false ); y2milestone( "win=%1", win ); if( win != nil && psize > 300*1024*1024 ) { -- 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] r60294 - in /trunk/storage/storage/src: include/ep-dialogs.ycp modules/Storage.ycp modules/StorageProposal.ycp
by aschnell＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: aschnell Date: Fri Jan 8 15:52:24 2010 New Revision: 60294 URL: http://svn.opensuse.org/viewcvs/yast?rev=60294&view=rev Log: - use GetFreeInfo instead of GetFreeSpace in IsEfiPartition - removed unused parameter from GetFreeSpace Modified: trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Fri Jan 8 15:52:24 2010 @@ -591,7 +591,7 @@ { if (used_fs != `swap) { - map free_data = Storage::GetFreeSpace(device, 0, used_fs, true); + map free_data = Storage::GetFreeSpace(device, used_fs, true); if (size(free_data) == 0 || !free_data["ok"]:false) { y2error("Failed to retrieve FreeSpace %1, filesystem %2", device, data["used_fs"]:`none); Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Fri Jan 8 15:52:24 2010 @@ -845,7 +845,7 @@ * @param symbol used_fs * @param boolean verbose */ -global map GetFreeSpace(string device, integer testsize, symbol used_fs, boolean verbose) +global map GetFreeSpace(string device, symbol used_fs, boolean verbose) { map<symbol, any> resize_info = $[]; map<symbol, any> content_info = $[]; @@ -2978,14 +2978,24 @@ return( ret ); } -define boolean IsEfiPartition( map p ) + +boolean IsEfiPartition(map p) { - map m = GetFreeSpace( p["device"]:"", 0, p["used_fs"]:`none, false ); - boolean ret = m["efi"]:false; - y2milestone( "IsEfiPartition ret:%1", ret ); - return( ret ); + boolean ret = false; + + map<symbol, any> resize_info = $[]; + map<symbol, any> content_info = $[]; + if (GetFreeInfo(p["device"]:"", false, resize_info, true, content_info, true) && + content_info[`efi]:false) + { + ret = true; } + y2milestone("IsEfiPartition ret:%1", ret); + return ret; + } + + /** * Search in the list partitions for windows partitions and add the key * "mount" to the found windows partitions. Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Fri Jan 8 15:52:24 2010 @@ -329,7 +329,7 @@ if (Partitions::IsDosWinNtPartition(p["fsid"]:0) && contains([ `ntfs, `vfat ], p["used_fs"]:`none)) { - p["winfo"] = Storage::GetFreeSpace(p["device"]:"", 0, + p["winfo"] = Storage::GetFreeSpace(p["device"]:"", p["used_fs"]:`none, false); y2milestone("AddWinInfo %1", p); } -- 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] r60293 - in /branches/SuSE-Code-11-SP1-Branch/storage: libstorage/src/MdCo.cc libstorage/src/MdCo.h package/yast2-storage.changes
by aschnell＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: aschnell Date: Fri Jan 8 15:39:09 2010 New Revision: 60293 URL: http://svn.opensuse.org/viewcvs/yast?rev=60293&view=rev Log: - removed obsolete function Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.h branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc Fri Jan 8 15:39:09 2010 @@ -268,14 +268,6 @@ return( findMd( dev, i )); } -unsigned -MdCo::unusedNumber() - { - unsigned i=0; - while( findMd(i) && i<1000 ) - i++; - return( i ); - } int MdCo::usedNumbers(list<int>& nums) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.h Fri Jan 8 15:39:09 2010 @@ -56,11 +56,6 @@ bool equalContent( const Container& rhs ) const; void logDifference( const Container& d ) const; - /* This function is deprecated and should not be used. - * It returns first free 'md' number for Non-partitionable MD RAIDs - * Regardless from Partitionable RAIDs and this can lead to errors. - */ - unsigned unusedNumber(); void syncRaidtab(); void changeDeviceName( const string& old, const string& nw ); Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Fri Jan 8 15:39:09 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 08 15:28:03 CET 2010 - aschnell(a)suse.de + +- fixed numbering of RAIDs (bnc #567662) +- 2.17.87 + +------------------------------------------------------------------- Mon Dec 21 13:03:03 CET 2009 - fehr(a)suse.de - backported crypt related fixes from HEAD -- 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] r60292 - in /trunk/storage: bindings/ycp/ package/ storage/src/modules/ storage/src/testsuite/data/reuse-home/ storage/src/testsuite/data/windows-only/
by aschnell＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: aschnell Date: Fri Jan 8 14:56:46 2010 New Revision: 60292 URL: http://svn.opensuse.org/viewcvs/yast?rev=60292&view=rev Log: - delay ntfs resize check until partitioning proposal (bnc #533568) Modified: trunk/storage/bindings/ycp/LibStorage.i trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/testsuite/data/reuse-home/free.info trunk/storage/storage/src/testsuite/data/windows-only/free.info Modified: trunk/storage/bindings/ycp/LibStorage.i URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/bindings/ycp/LibStorage.… ============================================================================== --- trunk/storage/bindings/ycp/LibStorage.i (original) +++ trunk/storage/bindings/ycp/LibStorage.i Fri Jan 8 14:56:46 2010 @@ -41,6 +41,8 @@ specialize_sequence(storage::DmmultipathInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::PartitionSlotInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::CommitInfo, TO_PACK, FROM_PACK, CHECK) +specialize_sequence(storage::ResizeInfo, TO_PACK, FROM_PACK, CHECK) +specialize_sequence(storage::ContentInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::Environment, TO_PACK, FROM_PACK, CHECK) Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Jan 8 14:56:46 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jan 08 14:37:40 CET 2010 - aschnell(a)suse.de + +- delay ntfs resize check until partitioning proposal (bnc #533568) + +------------------------------------------------------------------- Tue Jan 05 16:59:39 CET 2010 - aschnell(a)suse.de - removed unused parameter from function Storage::DeleteDevice Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Fri Jan 8 14:56:46 2010 @@ -68,6 +68,8 @@ import "LibStorage::PartitionSlotInfo"; import "LibStorage::CommitInfo"; import "LibStorage::DlabelCapabilities"; + import "LibStorage::ResizeInfo"; + import "LibStorage::ContentInfo"; import "LibStorage::Environment"; @@ -796,6 +798,45 @@ } +boolean GetFreeInfo(string device, boolean get_resize, map<symbol, any>& resize_info, + boolean get_content, map<symbol, any>& content_info, boolean use_cache) +{ + resize_info = $[]; + content_info = $[]; + + any tmp1 = LibStorage::ResizeInfo::new("LibStorage::ResizeInfo"); + any tmp2 = LibStorage::ContentInfo::new("LibStorage::ContentInfo"); + + boolean ret = LibStorage::StorageInterface::getFreeInfo(sint, device, get_resize, tmp1, + get_content, tmp2, use_cache); + + if (ret) + { + if (get_resize) + { + resize_info = $[ + `df_free_k : LibStorage::ResizeInfo::swig_df_freeK_get(tmp1), + `resize_free_k : LibStorage::ResizeInfo::swig_resize_freeK_get(tmp1), + `used_k : LibStorage::ResizeInfo::swig_usedK_get(tmp1), + `resize_ok : LibStorage::ResizeInfo::swig_resize_ok_get(tmp1) + ]; + } + + if (get_content) + { + content_info = $[ + `windows : LibStorage::ContentInfo::swig_windows_get(tmp2), + `efi : LibStorage::ContentInfo::swig_efi_get(tmp2), + `home : LibStorage::ContentInfo::swig_home_get(tmp2) + ]; + } + } + + y2milestone("GetFreeInfo device:%1 ret:%2", device, ret); + return ret; +} + + /** * Returns map of free space per partition * @@ -806,23 +847,20 @@ */ global map GetFreeSpace(string device, integer testsize, symbol used_fs, boolean verbose) { - integer used = 0; - integer resize_free = 0; - integer df_free = 0; - boolean win_disk = false; - boolean efi = false; - boolean home = false; - - boolean r = false; - r = LibStorage::StorageInterface::getFreeInfo( sint, device, resize_free, - df_free, used, win_disk, - efi, home, used_fs==`ntfs ); - - resize_free = resize_free * 1024; // Byte - df_free = df_free * 1024; // Byte - used = used * 1024; // Byte + map<symbol, any> resize_info = $[]; + map<symbol, any> content_info = $[]; + + boolean r = GetFreeInfo(device, true, resize_info, true, content_info, used_fs == `ntfs); + + integer used = 1024 * resize_info[`used_k]:0; + integer resize_free = 1024 * resize_info[`resize_free_k]:0; + integer df_free = 1024 * resize_info[`df_free_k]:0; + boolean resize_ok = resize_info[`resize_ok]:false; - if( used_fs == `ntfs && !r && verbose ) + boolean win_disk = content_info[`windows]:false; + boolean efi = content_info[`efi]:false; + + if( used_fs == `ntfs && (!r || !resize_ok) && verbose ) { string cmd = sformat("/usr/sbin/ntfsresize -f -i '%1'", device); y2milestone( "GetFreeSpace Executing cmd:%1", cmd ); @@ -3510,17 +3548,14 @@ if( !p["created"]:false && contains( poss_fs, p["detected_fs"]:`unknown ) && !isempty(device) ) { - integer used = 0; - integer resize_free = 0; - integer df_free = 0; - boolean win_disk = false; - boolean efi = false; - boolean home = false; - - if (LibStorage::StorageInterface::getFreeInfo(sint, device, resize_free, - df_free, used, win_disk, - efi, home, true)) - ret = home; + map<symbol, any> resize_info = $[]; + map<symbol, any> content_info = $[]; + + if (GetFreeInfo(device, false, resize_info, true, content_info, true) && + content_info[`home]:false) + { + ret = true; + } } y2milestone("DetectHomeFs device:%1 ret:%2", device, ret); return ret; @@ -4058,8 +4093,6 @@ list<map> GetPrimPartitions(map<string, map> targets, boolean foreign_os) { list<map> ret = []; - map entry = $[]; - string text = ""; integer num_dos = 0; integer num_win = 0; integer num_os2 = 0; @@ -4078,10 +4111,15 @@ SCR::Execute (.target.bash, "/usr/lib/YaST2/bin/check.boot "+device) == 0) { - text = ""; + string text = ""; if( Partitions::IsDosWinNtPartition( part["fsid"]:0 ) && - data["used_by_type"]:`UB_NONE==`UB_NONE && - GetFreeSpace( device, 0, part["used_fs"]:`none, false )["win_disk"]:false ) + data["used_by_type"]:`UB_NONE==`UB_NONE ) + { + map<symbol, any> resize_info = $[]; + map<symbol, any> content_info = $[]; + + if (GetFreeInfo(device, false, resize_info, true, content_info, true) && + content_info[`windows]:false) { if( contains( Partitions::fsid_dostypes, part["fsid"]:0 ) ) { @@ -4094,6 +4132,7 @@ text = win_text; } } + } else if( part["fsid"]:0 == 0x12 && !foreign_os ) { text = "Vendor diagnostic"; @@ -4109,18 +4148,18 @@ text = linux_text; num_linux = num_linux+1; } - if( size(text)>0 ) + if (!isempty(text)) { - entry["device"] = device; - entry["string"] = text; - ret = add( ret, eval(entry) ); - y2milestone( "new entry %1", entry ); + map entry = $[ "device" : device, "text" : text ]; + y2milestone( "new entry %1", entry ); + ret = add(ret, entry); } } }); }); y2milestone( "GetPrimPartitions foreign_os:%5 num_linux %1 num_win %2 num_dos %3 num_os2 %4", num_linux, num_win, num_dos, num_os2, foreign_os ); + integer num = 1; if( num_linux>1 ) { Modified: trunk/storage/storage/src/testsuite/data/reuse-home/free.info URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/reuse-home/free.info (original) +++ trunk/storage/storage/src/testsuite/data/reuse-home/free.info Fri Jan 8 14:56:46 2010 @@ -1 +1 @@ -/dev/sda3 df_free=23338740 resize_free=23338740 used=26203196 windows=0 efi=0 home=1 resize_ok=1 +/dev/sda3 resize_cached=1 df_free=23338740 resize_free=23338740 used=26203196 resize_ok=1 content_cached=1 windows=0 efi=0 home=1 Modified: trunk/storage/storage/src/testsuite/data/windows-only/free.info URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/windows-only/free.info (original) +++ trunk/storage/storage/src/testsuite/data/windows-only/free.info Fri Jan 8 14:56:46 2010 @@ -1 +1 @@ -/dev/sda1 df_free=64991212 resize_free=64991212 used=13156948 windows=1 efi=0 home=0 resize_ok=1 +/dev/sda1 resize_cached=1 df_free=64991212 resize_free=64991212 used=13156948 resize_ok=1 content_cached=1 windows=1 efi=0 home=0 -- 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] r60291 - /tags/branch-Code-11-SP1-2_17_66/bootloader/
by juhliarik＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: juhliarik Date: Fri Jan 8 14:03:33 2010 New Revision: 60291 URL: http://svn.opensuse.org/viewcvs/yast?rev=60291&view=rev Log: Created tag branch-Code-11-SP1-2_17_66 for bootloader Added: tags/branch-Code-11-SP1-2_17_66/bootloader/ (props changed) - copied from r60290, 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] r60290 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes src/routines/lilolike.ycp
by juhliarik＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: juhliarik Date: Fri Jan 8 14:03:26 2010 New Revision: 60290 URL: http://svn.opensuse.org/viewcvs/yast?rev=60290&view=rev Log: added fix for worng Intel MD RAID -> fix data in device.map 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/routines/lilolike.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 Fri Jan 8 14:03:26 2010 @@ -1 +1 @@ -2.17.65 +2.17.66 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 Fri Jan 8 14:03:26 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +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 + (bnc#568837) +- 2.17.66 + +------------------------------------------------------------------- Fri Dec 4 12:05:28 CET 2009 - juhliarik(a)suse.cz - added patch for KMS (bnc#560423) -> disable KMS for failsafe Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp Fri Jan 8 14:03:26 2010 @@ -1114,6 +1114,45 @@ return ret; } +/** bnc#568837 wrong data in device map + * Function check if disk is in list of devices + * @param string disk + * @param list<string> list of devices + * @return true if success + */ + +boolean isDiskInList (string disk, list<string> devices) +{ + boolean ret = false; + foreach(string dev, devices, + { + if (dev == disk) + { + ret = true; + break; + } + }); + return ret; +} + +/** bnc#568837 wrong data in device map + * Check if disk is in MDRaid it means completed disk is used in RAID + * @param disk (/dev/sda) + * @param tm - target map + * @return - true if disk (not only part of disk) is in MDRAID + */ +boolean isDiskInMDRaid (string disk, map<string,map> tm) +{ + boolean ret = false; + foreach( string dev, map d_info, tm, + { + if (d_info["type"]:nil == `CT_MDPART) + ret = isDiskInList(disk, d_info["devices"]:[]); + if (ret) + break; + }); + return ret; +} /*** helper functions END ***/ @@ -1148,10 +1187,6 @@ else targetMap = (map<string,map>)Storage::GetTargetMap(); - // filter out members of BIOS RAIDs and multipath devices - targetMap = filter (string k, map v, targetMap, { - return v["used_by_type"]:nil != `UB_DMRAID && v["used_by_type"]:nil != `UB_DMMULTIPATH; - }); // filter out non-disk devices targetMap = filter (string k, map v, targetMap, { return v["type"]:`CT_UNKNOWN==`CT_DMRAID || v["type"]:`CT_UNKNOWN==`CT_DISK @@ -1159,6 +1194,13 @@ (v["type"]:`CT_UNKNOWN==`CT_MDPART && checkMDRaidDevices(v["devices"]:[], targetMap)); }); + // bnc#568837 wrong data in device map + // filter out members of BIOS RAIDs and multipath devices + targetMap = filter (string k, map v, targetMap, { + return v["used_by_type"]:nil != `UB_DMRAID && v["used_by_type"]:nil != `UB_DMMULTIPATH&& + ((v["used_by_type"]:nil == `UB_MDPART) ? (!isDiskInMDRaid(k,targetMap)):true); + }); + y2milestone ("Target map: %1", targetMap); // add devices with known bios_id -- 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] r60289 - /tags/branch-Code-11-SP1-2_17_18/kdump/
by juhliarik＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: juhliarik Date: Fri Jan 8 13:58:06 2010 New Revision: 60289 URL: http://svn.opensuse.org/viewcvs/yast?rev=60289&view=rev Log: Created tag branch-Code-11-SP1-2_17_18 for kdump Added: tags/branch-Code-11-SP1-2_17_18/kdump/ (props changed) - copied from r60288, branches/SuSE-Code-11-SP1-Branch/kdump/ -- 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] r60288 - /tags/branch-Code-11-SP1-2_17_18/
by juhliarik＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: juhliarik Date: Fri Jan 8 13:58:05 2010 New Revision: 60288 URL: http://svn.opensuse.org/viewcvs/yast?rev=60288&view=rev Log: Created tag branch-Code-11-SP1-2_17_18 Added: tags/branch-Code-11-SP1-2_17_18/ -- 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] r60287 - in /branches/SuSE-Code-11-SP1-Branch/kdump: VERSION package/yast2-kdump.changes src/Kdump.ycp src/kdump_finish.ycp
by juhliarik＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: juhliarik Date: Fri Jan 8 13:57:53 2010 New Revision: 60287 URL: http://svn.opensuse.org/viewcvs/yast?rev=60287&view=rev Log: added fix for deleting offset for crashkernel value Modified: branches/SuSE-Code-11-SP1-Branch/kdump/VERSION branches/SuSE-Code-11-SP1-Branch/kdump/package/yast2-kdump.changes branches/SuSE-Code-11-SP1-Branch/kdump/src/Kdump.ycp branches/SuSE-Code-11-SP1-Branch/kdump/src/kdump_finish.ycp Modified: branches/SuSE-Code-11-SP1-Branch/kdump/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/kdump… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/kdump/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/kdump/VERSION Fri Jan 8 13:57:53 2010 @@ -1 +1 @@ -2.17.17 +2.17.18 Modified: branches/SuSE-Code-11-SP1-Branch/kdump/package/yast2-kdump.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/kdump… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/kdump/package/yast2-kdump.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/kdump/package/yast2-kdump.changes Fri Jan 8 13:57:53 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 7 15:22:05 CET 2010 - juhliarik(a)suse.cz + +- deleted offset "@16M" from crashkernel option (bnc#565122) and + (bnc#563905) +- 2.17.18 + +------------------------------------------------------------------- Tue Nov 10 11:47:35 CET 2009 - juhliarik(a)suse.cz - disbaled kdump in YaST on s390 (bnc#524164) Modified: branches/SuSE-Code-11-SP1-Branch/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/kdump… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/kdump/src/Kdump.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/kdump/src/Kdump.ycp Fri Jan 8 13:57:53 2010 @@ -364,7 +364,24 @@ string result = ""; string kernel_boot_options = ""; integer min_dif_size = 1000; - + + if (Mode::update()) + { + result = Bootloader::getDefaultSection (); + integer section_position = -1; + foreach(map section, BootCommon::sections, + { + section_position = section_position +1; + string name = tostring(section["name"]:nil); + + if ((name == result) && (section["xen_append"]:nil != nil)) + { + section_pos = section_position; + kernel_version = "xen"; + } + }); + return result; + } // reading bootloader settings boolean old_progress = Progress::set (false); Bootloader::Read(); @@ -539,11 +556,9 @@ string crash_value = ""; crash_value = alocated_memory+"M"; - if ((Arch::i386()) ||(Arch::x86_64())) { - crash_value = crash_value + "@16M"; - y2milestone("Common offset 16M"); - } else if ((Arch::ia64()) || Arch::ppc64()) { - y2milestone("ia64 or ppc64 platform without offset"); + // bnc#563905 problem with offset in crashkernel + if ((Arch::i386()) ||(Arch::x86_64()) || (Arch::ia64()) || Arch::ppc64()) { + y2milestone("i386, x86_64, ia64 and ppc64 platforms are without offset"); } else { if (Mode::normal()) Popup::Error(_("Unsupported architecture, \"crashkernel\" was not added")); @@ -574,8 +589,9 @@ { crash_value = getAlocatedMemory(crash)+"M"; - if ((Arch::i386()) ||(Arch::x86_64()) || Arch::ppc64()) - crash_value = crash_value + "@16M"; + // bnc#563905 problem with offset in crashkernel + //if ((Arch::i386()) ||(Arch::x86_64()) || Arch::ppc64()) + // crash_value = crash_value + "@16M"; } y2milestone("Converting crashkernel value from: (%1) to :(%2)",crash, crash_value); @@ -945,6 +961,17 @@ if (Mode::autoinst()) crash_value = crashkernel_param_value; + + + if (Mode::update()) + { + if (search(crash_value, "@") != nil) + { + list<string> tmp_crash_value = splitstring(crash_value, "@"); + crash_value = tmp_crash_value[0]:""; + y2milestone("Delete offset crashkernel value: %1", crash_value); + } + } // write crashkernel option to boot section if (section_pos == -1) { @@ -1054,6 +1081,19 @@ } /** + * Update crashkernel argument during update of OS + * @return true on success + */ + +global boolean Update() +{ + y2milestone("Update kdump settings"); + ReadKdumpKernelParam (); + WriteKdumpBootParameter (); + return true; +} + +/** * Write all kdump settings * @return true on success */ Modified: branches/SuSE-Code-11-SP1-Branch/kdump/src/kdump_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/kdump… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/kdump/src/kdump_finish.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/kdump/src/kdump_finish.ycp Fri Jan 8 13:57:53 2010 @@ -50,7 +50,11 @@ // propose settings for kdump if autoyast doesn't include settings for yast2-kdump if ((!Kdump::import_called) && (Mode::autoinst())) Kdump::Propose(); - Kdump::Write(); + + if (Mode::update()) + Kdump::Update(); + else + Kdump::Write(); } else { -- 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] r60286 - /tags/stable-2_19_6/country/
by jsuchome＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: jsuchome Date: Fri Jan 8 10:14:32 2010 New Revision: 60286 URL: http://svn.opensuse.org/viewcvs/yast?rev=60286&view=rev Log: Created tag stable-2_19_6 for country Added: tags/stable-2_19_6/country/ - copied from r60285, trunk/country/ -- 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] r60285 - in /trunk/country: VERSION keyboard/src/Makefile.am package/yast2-country.changes
by jsuchome＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: jsuchome Date: Fri Jan 8 10:14:27 2010 New Revision: 60285 URL: http://svn.opensuse.org/viewcvs/yast?rev=60285&view=rev Log: - package keyboard desktop file - 2.19.6 Modified: trunk/country/VERSION trunk/country/keyboard/src/Makefile.am trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=60285&r1=602… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Fri Jan 8 10:14:27 2010 @@ -1 +1 @@ -2.19.5 +2.19.6 Modified: trunk/country/keyboard/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/Makefile.am… ============================================================================== --- trunk/country/keyboard/src/Makefile.am (original) +++ trunk/country/keyboard/src/Makefile.am Fri Jan 8 10:14:27 2010 @@ -15,6 +15,10 @@ rnc_DATA = keyboard.rnc -EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(rnc_DATA) +desktop_DATA = \ + keyboard.desktop + + +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(rnc_DATA) $(desktop_DATA) include $(top_srcdir)/Makefile.am.common 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 Fri Jan 8 10:14:27 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 8 10:09:52 CET 2010 - jsuchome(a)suse.cz + +- package keyboard desktop file +- 2.19.6 + +------------------------------------------------------------------- Thu Jan 7 14:40:33 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