August 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r39923 - in /trunk/qt: VERSION package/yast2-qt.changes src/YQMultiSelectionBox.cc
by sh-sh-sh＠svn.opensuse.org 03 Aug '07

03 Aug '07

Author: sh-sh-sh Date: Fri Aug 3 12:43:16 2007 New Revision: 39923 URL: http://svn.opensuse.org/viewcvs/yast?rev=39923&view=rev Log: Fixed bug #295485: Text cut off in MultiSelectionBox Modified: trunk/qt/VERSION trunk/qt/package/yast2-qt.changes trunk/qt/src/YQMultiSelectionBox.cc Modified: trunk/qt/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION?rev=39923&r1=39922&r2… ============================================================================== --- trunk/qt/VERSION (original) +++ trunk/qt/VERSION Fri Aug 3 12:43:16 2007 @@ -1 +1 @@ -2.15.8 +2.15.9 Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Fri Aug 3 12:43:16 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 3 12:42:01 CEST 2007 - sh(a)suse.de + +- Fixed bug #295485: Text cut off in MultiSelectionBox + (in repository names in that bug) +- V 2.17.9 + +------------------------------------------------------------------- Thu Aug 2 17:34:26 CEST 2007 - sh(a)suse.de - V 2.17.8 Modified: trunk/qt/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMultiSelectionBox.cc?re… ============================================================================== --- trunk/qt/src/YQMultiSelectionBox.cc (original) +++ trunk/qt/src/YQMultiSelectionBox.cc Fri Aug 3 12:43:16 2007 @@ -56,6 +56,7 @@ _qt_listview->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); _qt_listview->addColumn( "" ); // QListView doesn't have one single column by default! _qt_listview->setSorting( 0, false ); + _qt_listview->header()->setStretchEnabled( true ); _qt_listview->header()->hide(); _qt_label->setBuddy( _qt_listview ); -- 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] r39922 - in /trunk/packager: package/yast2-packager.changes src/modules/AddOnProduct.ycp
by locilka＠svn.opensuse.org 03 Aug '07

03 Aug '07

Author: locilka Date: Fri Aug 3 11:56:47 2007 New Revision: 39922 URL: http://svn.opensuse.org/viewcvs/yast?rev=39922&view=rev Log: - Download and use y2update before merging installation.xml when use Add-On product in installation (#295160). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/AddOnProduct.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 Fri Aug 3 11:56:47 2007 @@ -13,6 +13,8 @@ - Using new pkg-bindings functionality to provide optional directory with licenses (#302018). - New text for License dialog (FATE #302018 comment #36). +- Download and use y2update before merging installation.xml when + use Add-On product in installation (#295160). ------------------------------------------------------------------- Thu Aug 2 11:08:37 CEST 2007 - lslezak(a)suse.cz Modified: trunk/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/AddOnProduc… ============================================================================== --- trunk/packager/src/modules/AddOnProduct.ycp (original) +++ trunk/packager/src/modules/AddOnProduct.ycp Fri Aug 3 11:56:47 2007 @@ -509,17 +509,18 @@ global boolean Integrate (integer srcid) { y2milestone ("Integrating repository %1", srcid); - // Adds workflow to the Workflow Store if any workflow exists - WorkflowManager::AddWorkflow (`addon, srcid, ""); - // Updating inst-sys string y2update = Pkg::SourceProvideOptionalFile (srcid, 1, "/y2update.tgz"); + if (y2update == nil) { y2milestone ("No YaST update found on the media"); } else { UpdateInstSys (y2update); } + // Adds workflow to the Workflow Store if any workflow exists + WorkflowManager::AddWorkflow (`addon, srcid, ""); + 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] r39921 - /tags/stable-2_15_40/pkg-bindings/
by lslezak＠svn.opensuse.org 03 Aug '07

03 Aug '07

Author: lslezak Date: Fri Aug 3 11:36:54 2007 New Revision: 39921 URL: http://svn.opensuse.org/viewcvs/yast?rev=39921&view=rev Log: Created tag stable-2_15_40 for pkg-bindings Added: tags/stable-2_15_40/pkg-bindings/ - copied from r39920, trunk/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] r39920 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Callbacks.cc src/Package.cc src/PkgModuleFunctions.h src/Resolvable.cc src/Source.cc
by lslezak＠svn.opensuse.org 03 Aug '07

03 Aug '07

Author: lslezak Date: Fri Aug 3 11:25:52 2007 New Revision: 39920 URL: http://svn.opensuse.org/viewcvs/yast?rev=39920&view=rev Log: - Pkg::ResolvableProperties() returns license and status if available - fixed id of undefined repository (-1 returned as unsigned) - 2.15.40 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Callbacks.cc trunk/pkg-bindings/src/Package.cc trunk/pkg-bindings/src/PkgModuleFunctions.h trunk/pkg-bindings/src/Resolvable.cc trunk/pkg-bindings/src/Source.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=39920&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Fri Aug 3 11:25:52 2007 @@ -1 +1 @@ -2.15.39 +2.15.40 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Aug 3 11:25:52 2007 @@ -1,7 +1,11 @@ ------------------------------------------------------------------- -Thu Aug 2 15:05:39 CEST 2007 - lslezak(a)suse.cz +Fri Aug 3 11:00:23 CEST 2007 - lslezak(a)suse.cz - added product directory support +- Pkg::ResolvableProperties() returns license and status if + available +- fixed id of undefined repository (-1 returned as unsigned) +- 2.15.40 ------------------------------------------------------------------- Thu Aug 2 09:56:21 CEST 2007 - lslezak(a)suse.cz Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Fri Aug 3 11:25:52 2007 @@ -513,7 +513,7 @@ size = pkg->downloadSize(); // convert the repo ID - int source_id = _pkg_ref.logFindAlias(pkg->repository().info().alias()); + long long source_id = _pkg_ref.logFindAlias(pkg->repository().info().alias()); int media_nr = pkg->mediaNr(); if( source_id != last_source_id || media_nr != last_source_media ) Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Fri Aug 3 11:25:52 2007 @@ -1003,8 +1003,8 @@ data->add( YCPString("arch"), YCPString( pkg->arch().asString() ) ); data->add( YCPString("medianr"), YCPInteger( pkg->mediaNr() ) ); - std::vector<YRepo_Ptr>::size_type sid = logFindAlias(pkg->repository().info().alias()); - y2debug("srcId: %d", sid ); + long long sid = logFindAlias(pkg->repository().info().alias()); + y2debug("srcId: %lld", sid ); data->add( YCPString("srcid"), YCPInteger( sid ) ); std::string status("available"); Modified: trunk/pkg-bindings/src/PkgModuleFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgModuleFuncti… ============================================================================== --- trunk/pkg-bindings/src/PkgModuleFunctions.h (original) +++ trunk/pkg-bindings/src/PkgModuleFunctions.h Fri Aug 3 11:25:52 2007 @@ -717,7 +717,7 @@ virtual ~PkgModuleFunctions (); // must be public, used in callbacks - std::vector<YRepo_Ptr>::size_type logFindAlias(const std::string &alias) const; + long long logFindAlias(const std::string &alias) const; virtual const string name () const { Modified: trunk/pkg-bindings/src/Resolvable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable.cc?r… ============================================================================== --- trunk/pkg-bindings/src/Resolvable.cc (original) +++ trunk/pkg-bindings/src/Resolvable.cc Fri Aug 3 11:25:52 2007 @@ -405,6 +405,14 @@ zypp::Repository repo = (*it)->repository(); info->add(YCPString("source"), YCPInteger(logFindAlias(repo.info().alias()))); + // add license info if it is defined + std::string license = (*it)->licenseToConfirm(); + if (!license.empty()) + { + info->add(YCPString("license_confirmed"), YCPBoolean(it->status().isLicenceConfirmed())); + info->add(YCPString("license"), YCPString(license)); + } + // product specific info if( req_kind == "product" ) { zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>(it->resolvable()); Modified: trunk/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=3… ============================================================================== --- trunk/pkg-bindings/src/Source.cc (original) +++ trunk/pkg-bindings/src/Source.cc Fri Aug 3 11:25:52 2007 @@ -286,7 +286,7 @@ return YRepo_Ptr(); } -std::vector<YRepo_Ptr>::size_type PkgModuleFunctions::logFindAlias(const std::string &alias) const +long long PkgModuleFunctions::logFindAlias(const std::string &alias) const { std::vector<YRepo_Ptr>::size_type index = 0; @@ -296,7 +296,7 @@ return index; } - return -1; + return -1LL; } bool PkgModuleFunctions::aliasExists(const std::string &alias) const @@ -1329,7 +1329,7 @@ unsigned int id = 0; while(aliasExists(ret)) { - y2milestone("Alias %s already found: %d", ret.c_str(), logFindAlias(ret)); + y2milestone("Alias %s already found: %lld", ret.c_str(), logFindAlias(ret)); // the alias already exists - add a counter std::ostringstream ostr; @@ -1784,7 +1784,7 @@ { y2error ("Invalid URL: %s", expt.asString().c_str()); _last_error.setLastError(expt.asUserString()); - return YCPInteger (-1); + return YCPInteger (-1LL); } @@ -1834,7 +1834,7 @@ y2error("SourceCreate for '%s' product '%s' has failed" , url.asString().c_str(), pn.asString().c_str()); _last_error.setLastError(excpt.asUserString()); - return YCPInteger(-1); + return YCPInteger(-1LL); } } } 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] r39919 - in /trunk/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 03 Aug '07

03 Aug '07

Author: locilka Date: Fri Aug 3 10:35:11 2007 New Revision: 39919 URL: http://svn.opensuse.org/viewcvs/yast?rev=39919&view=rev Log: - Using new pkg-bindings functionality to provide optional directory with licenses (#302018). - New text for License dialog (FATE #302018 comment #36). 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 Fri Aug 3 10:35:11 2007 @@ -10,6 +10,9 @@ first stage installation (instead of 'official'). - Reporting when list of repositories is empty, cannot be downloaded or parsed (#294997). +- Using new pkg-bindings functionality to provide optional + directory with licenses (#302018). +- New text for License dialog (FATE #302018 comment #36). ------------------------------------------------------------------- Thu Aug 2 11:08:37 CEST 2007 - lslezak(a)suse.cz 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 Fri Aug 3 10:35:11 2007 @@ -158,8 +158,8 @@ `Left ( // TRANSLATORS: addition license information // FATE #302018 - `Label (_("If you like to print this license, -check the EULA.txt file on the first media.")) + `Label (_("If you want to print this EULA, you can find it +on the first media in the directory '/media.1/licenses/'")) ), `HSpacing (2*space) ), @@ -263,9 +263,14 @@ // FATE #302018 // Licenses are unzipped under 1stMedia:/media.1/license/ // Don't unzip, just use the directory - license_dir = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/license/license.txt"); + license_dir = Pkg::SourceProvideDirectory ( + src_id, 1, + "/media.1/license/", + true, /* optional */ + false /* no subdirs */ + ); if (license_dir != nil) { - license_dir = Pkg::SourceProvideDir (src_id, 1, "/media.1/license/"); + y2milestone ("Using directory %1 for licenses", license_dir); // return from the function return; } -- 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] r39918 - in /trunk/packager: agents/ag_xmlrepos package/yast2-packager.changes src/clients/inst_productsources.ycp
by locilka＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: locilka Date: Thu Aug 2 21:20:34 2007 New Revision: 39918 URL: http://svn.opensuse.org/viewcvs/yast?rev=39918&view=rev Log: - Support for localized strings in remote repositories (inst_productsources). - Better error handling when parsing downloaded XML file in ag_xmlrepos. - Added support for downloading from HTTPS servers. - Only repositories with 'installation_repo' tag set are used in first stage installation (instead of 'official'). - Reporting when list of repositories is empty, cannot be downloaded or parsed (#294997). Modified: trunk/packager/agents/ag_xmlrepos trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_productsources.ycp Modified: trunk/packager/agents/ag_xmlrepos URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/agents/ag_xmlrepos?rev=… ============================================================================== --- trunk/packager/agents/ag_xmlrepos (original) +++ trunk/packager/agents/ag_xmlrepos Thu Aug 2 21:20:34 2007 @@ -150,7 +150,13 @@ } } - push @repos, $this_repo; + # URL must be defined + # The XML content might be, for instance, 404 Error Page, etc. + if (defined $this_repo->{'url'} && $this_repo->{'url'} ne "") { + push @repos, $this_repo; + } else { + y2warning ("Ignoring repository, no URL defined"); + } } } 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 Thu Aug 2 21:20:34 2007 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Aug 2 21:13:04 CEST 2007 - locilka(a)suse.cz + +- Support for localized strings in remote repositories + (inst_productsources). +- Better error handling when parsing downloaded XML file in + ag_xmlrepos. +- Added support for downloading from HTTPS servers. +- Only repositories with 'installation_repo' tag set are used in + first stage installation (instead of 'official'). +- Reporting when list of repositories is empty, cannot be + downloaded or parsed (#294997). + +------------------------------------------------------------------- Thu Aug 2 11:08:37 CEST 2007 - lslezak(a)suse.cz - inst_source - download metadata for CD/DVD repositories Modified: trunk/packager/src/clients/inst_productsources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_produc… ============================================================================== --- trunk/packager/src/clients/inst_productsources.ycp (original) +++ trunk/packager/src/clients/inst_productsources.ycp Thu Aug 2 21:20:34 2007 @@ -15,6 +15,7 @@ * <item> * <link>http://some.server/some_link.xml</link> * <official config:type="boolean">true</official> + * <installation_repo config:type="boolean">true</installation_repo> * </item> * <item> * <link>ftp://some.other.server/some_link.xml</link> @@ -23,7 +24,7 @@ * </servers> * </productDefines> * - * Only official (trusted) links are used during installation. + * Only installation_repo=true (trusted) links are used during installation. * See Bugzilla #293811. * * Format of Suggested sources: @@ -75,6 +76,7 @@ import "AddOnProduct"; import "GetInstArgs"; import "OneClickInstallStandard"; + import "Language"; include "installation/misc.ycp"; @@ -92,6 +94,9 @@ // List of IDs of URLs to be added list <string> repos_to_be_used = []; + string language_long = ""; + string language_short = ""; + // Map of already used suggested repositories // $[ "($url|$path)" : src_id ] map <string, integer> repos_already_used = $[]; @@ -253,6 +258,11 @@ server_response = FTP::Get (from, to); + } else if (regexpmatch (from, "^[hH][tT][tT][pP][sS]://")) { + from = regexpsub (from, "^[hH][tT][tT][pP][sS]://(.*)", "https://\\1"); + + server_response = HTTP::Get (from, to); + } else { y2error ("Not a supported type: %1", from); return false; @@ -289,10 +299,10 @@ list_of_servers = xml_file_content["servers"]:[]; // bugzilla #293811 - // only official (trusted) links are used during installation + // only installation_repo (trusted) links are used during installation if (Stage::initial()) { list_of_servers = filter (map one_server, list_of_servers, { - if (one_server["official"]:false == true) { + if (one_server["installation_repo"]:false == true) { return true; } else { y2milestone ("Sever %1 is not used during installation...", one_server); @@ -368,6 +378,16 @@ return true; } + string GetCurrentLang () { + map cmd = (map) SCR::Execute (.target.bash_output, "echo -n $LANG"); + string ret = tostring (cmd["stdout"]:""); + + if (ret == "C" || ret == "") ret = nil; + + y2milestone ("Using lang: %1", ret); + return ret; + } + symbol ReadDialog () { list <string> actions_todo = [ // TRANSLATORS: progress step @@ -408,18 +428,41 @@ if (! NetworkRunning()) { y2warning ("Cannot proceed, no network configured..."); + // TRANSLATORS: error report + Report::Error (_("Cannot download list of repositories, +no network is configured.")); + return `nosources; } Progress::NextStage(); + // language used for possible translations + if (! Stage::initial()) + language_long = GetCurrentLang (); + + // fallback if no LANG variable set + if (language_long == nil) + language_long = Language::language; + + language_short = substring (language_long, 0, 2); + y2milestone ("Preferred language: %1 %2", language_long, language_short); + if (! ReadControlFile()) { y2milestone ("Feature not supported by the product"); + // TRANSLATORS: light-warning message + Report::Message (_("No product URL defined to download +list of repositories from.")); + return `nosources; } if (! DownloadAndParseSources()) { y2error ("Cannot download or parse repositories"); + // TRANSLATORS: warning message + Report::Warning (_("Unable to download list of repositories +or no repositories defined.")); + return `nosources; } @@ -434,6 +477,53 @@ return `next; } + /** + * Returns a localized string using given parametters. + * + * @param string current_id to identify the source in list_of_repos map + * @param list <string> possible_keys containing which keys in the map + * should be tried (something is always better than amty string) + * + * @struct $[ + * // key + * "description" : "repository description", + * // "localized" + key + * "localized_description" : $[ + * "en_GB" : "repository description (localized to en_GB)", + * ... + * ], + * ] + */ + string GetLocalizedString (string current_id, list <string> possible_keys) { + string ret = ""; + + foreach (string possible_key, possible_keys, { + string loc_key = sformat ("localized_%1", possible_key); + + if (list_of_repos[current_id, loc_key, language_long]:"" != "") { + ret = list_of_repos[current_id, loc_key, language_long]:""; + break; + } else if (list_of_repos[current_id, loc_key, language_short]:"" != "") { + ret = list_of_repos[current_id, loc_key, language_long]:""; + break; + } + }); + + if (ret != "") return ret; + + foreach (string possible_key, possible_keys, { + if (list_of_repos[current_id, possible_key]:"" != "") { + ret = list_of_repos[current_id, possible_key]:""; + break; + } else if (list_of_repos[current_id, possible_key]:"" != "") { + ret = list_of_repos[current_id, possible_key]:""; + break; + } + }); + + return ret; + } + void PrintRepositoryDescription () { string current_id = (string) UI::QueryWidget (`id ("addon_repos"), `CurrentItem); @@ -458,8 +548,8 @@ </p>"), list_of_repos[current_id, "url"]:"", list_of_repos[current_id, "url_from"]:"", - list_of_repos[current_id, "summary"]:list_of_repos[current_id, "name"]:"", - list_of_repos[current_id, "description"]:"" + GetLocalizedString (current_id, ["summary", "name"]), + GetLocalizedString (current_id, ["description"]) ); UI::ChangeWidget (`id ("addon_description"), `Value, description); @@ -515,7 +605,7 @@ items[counter] = `item ( `id (repo_id), - one_repo["name"]:one_repo["url"]:"", + GetLocalizedString (repo_id, ["name", "url"]), already_used ); @@ -818,13 +908,13 @@ // TRANSLATORS: progress step // %1 is replaced with repository name or URL _("Add repository: %1"), - list_of_repos[repo_id, "name"]:repo_id + GetLocalizedString (repo_id, ["name", "url"]) )); actions_doing = add (actions_doing, sformat ( // TRANSLATORS: progress step, // %1 is replaced with repository name or URL _("Adding repository: %1 ..."), - list_of_repos[repo_id, "name"]:repo_id + GetLocalizedString (repo_id, ["name", "url"]) )); }); } -- 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] r39917 - /tags/stable-2_15_8/qt/
by sh-sh-sh＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: sh-sh-sh Date: Thu Aug 2 17:53:27 2007 New Revision: 39917 URL: http://svn.opensuse.org/viewcvs/yast?rev=39917&view=rev Log: Created tag stable-2_15_8 for qt Added: tags/stable-2_15_8/qt/ - copied from r39916, trunk/qt/ -- 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] r39916 - in /branches/tmp/sh/before-qt4/qt/src/pkg: YQPkgPatchFilterView.cc YQPkgPatchFilterView.h YQPkgPatchList.cc YQPkgPatchList.h
by sh-sh-sh＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: sh-sh-sh Date: Thu Aug 2 17:52:02 2007 New Revision: 39916 URL: http://svn.opensuse.org/viewcvs/yast?rev=39916&view=rev Log: show only update stack patches if there are any Modified: branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchFilterView.cc branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchFilterView.h branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchList.cc branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchList.h Modified: branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/before-qt4/qt/src/pkg/… ============================================================================== --- branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchFilterView.cc (original) +++ branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchFilterView.cc Thu Aug 2 17:52:02 2007 @@ -53,6 +53,7 @@ : QVBox( parent ) { QVBox * vbox; + _haveUpdateStackPatches = YQPkgPatchList::haveUpdateStackPatches(); _splitter = new QSplitter( QSplitter::Vertical, this ); CHECK_PTR( _splitter ); vbox = new QVBox( _splitter ); CHECK_PTR( vbox ); @@ -68,9 +69,15 @@ _patchFilter = new QComboBox( hbox ); CHECK_PTR( _patchFilter ); - _patchFilter->insertItem( _( "Installable Patches" ), 0 ); - _patchFilter->insertItem( _( "Installable and Installed Patches" ), 1 ); - _patchFilter->insertItem( _( "All Patches" ), 2 ); + int index = 0; + + if ( _haveUpdateStackPatches ) + // Translators: This is about patches that patch the update engine (libzypp, YaST) itself + _patchFilter->insertItem( _( "Update Stack Patches" ), index++ ); + + _patchFilter->insertItem( _( "Installable Patches" ), index++ ); + _patchFilter->insertItem( _( "Installable and Installed Patches" ), index++ ); + _patchFilter->insertItem( _( "All Patches" ), index++ ); _patchFilter->setCurrentItem( 0 ); _patchFilter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert label->setBuddy( _patchFilter ); @@ -118,6 +125,7 @@ connect( _patchList, SIGNAL( statusChanged() ), this, SLOT ( updateTotalDownloadSize() ) ); + fillPatchList(); updateTotalDownloadSize(); } @@ -210,8 +218,14 @@ void YQPkgPatchFilterView::fillPatchList() { - switch ( _patchFilter->currentItem() ) + int currentIndex = _patchFilter->currentItem(); + + if ( _haveUpdateStackPatches ) + currentIndex--; + + switch ( currentIndex ) { + case -1: _patchList->setFilterCriteria( YQPkgPatchList::UpdateStackPatches ); break; case 0: _patchList->setFilterCriteria( YQPkgPatchList::RelevantPatches ); break; case 1: _patchList->setFilterCriteria( YQPkgPatchList::RelevantAndInstalledPatches ); break; case 2: _patchList->setFilterCriteria( YQPkgPatchList::AllPatches ); break; Modified: branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/before-qt4/qt/src/pkg/… ============================================================================== --- branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchFilterView.h (original) +++ branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchFilterView.h Thu Aug 2 17:52:02 2007 @@ -91,6 +91,7 @@ QLabel * _totalDownloadSize; YQPkgSelMapper _selMapper; + bool _haveUpdateStackPatches; }; Modified: branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/before-qt4/qt/src/pkg/… ============================================================================== --- branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchList.cc (original) +++ branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchList.cc Thu Aug 2 17:52:02 2007 @@ -34,7 +34,8 @@ #include "YQPkgTextDialog.h" -#define VERBOSE_PATCH_LIST 1 +#define VERBOSE_PATCH_LIST 1 +#define DEBUG_SHOW_ALL_UPDATE_STACK_PATCHES 0 typedef zypp::ui::PatchContents ZyppPatchContents; @@ -72,7 +73,6 @@ this, SLOT ( filter() ) ); setSorting( categoryCol() ); - fillList(); y2debug( "Creating patch list done" ); } @@ -122,6 +122,35 @@ switch ( _filterCriteria ) { + case UpdateStackPatches: + + if ( zyppPatch->affects_pkg_manager() ) + { +#if DEBUG_SHOW_ALL_UPDATE_STACK_PATCHES + displayPatch = true; +#endif + if ( selectable->hasCandidateObj() && + selectable->candidatePoolItem().status().isNeeded() ) + { + displayPatch = true; + + y2milestone( "Found YaST patch that should be installed: %s - %s", + zyppPatch->name().c_str(), + zyppPatch->summary().c_str() ); + } + + if ( selectable->hasInstalledObj() && + selectable->installedPoolItem().status().isIncomplete() ) // patch broken? + { + displayPatch = true; + + y2warning( "Installed YaST patch is broken: %s - %s", + zyppPatch->name().c_str(), + zyppPatch->summary().c_str() ); + } + } + break; + case RelevantPatches: // needed + broken + satisfied (but not installed) if ( selectable->hasInstalledObj() ) // installed? @@ -347,6 +376,34 @@ } +bool +YQPkgPatchList::haveUpdateStackPatches() +{ + for ( ZyppPoolIterator it = zyppPatchesBegin(); + it != zyppPatchesEnd(); + ++it ) + { + ZyppSel selectable = *it; + ZyppPatch zyppPatch = tryCastToZyppPatch( selectable->theObj() ); + + if ( zyppPatch && zyppPatch->affects_pkg_manager() ) + { +#if DEBUG_SHOW_ALL_UPDATE_STACK_PATCHES + return true; +#else + if ( selectable->hasCandidateObj() && + selectable->candidatePoolItem().status().isNeeded() ) + { + return true; + } +#endif + } + } + + return false; +} + + YQPkgPatchListItem * YQPkgPatchList::selection() const { Modified: branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/before-qt4/qt/src/pkg/… ============================================================================== --- branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchList.h (original) +++ branches/tmp/sh/before-qt4/qt/src/pkg/YQPkgPatchList.h Thu Aug 2 17:52:02 2007 @@ -67,6 +67,7 @@ enum FilterCriteria { + UpdateStackPatches, // zypp or YaST2 RelevantPatches, // needed + broken RelevantAndInstalledPatches, // needed + broken + installed AllPatches // all @@ -112,6 +113,12 @@ public: /** + * Return 'true' if there is any patch for the update stack in the pool + * that is not installed yet or that could be updated. + **/ + static bool haveUpdateStackPatches(); + + /** * Set the filter criteria for fillList(). **/ void setFilterCriteria( FilterCriteria filterCriteria ); -- 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] r39915 - in /branches/tmp/sh/mod-ui/qt/src/pkg: YQPkgPatchFilterView.cc YQPkgPatchFilterView.h YQPkgPatchList.cc YQPkgPatchList.h
by sh-sh-sh＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: sh-sh-sh Date: Thu Aug 2 17:51:49 2007 New Revision: 39915 URL: http://svn.opensuse.org/viewcvs/yast?rev=39915&view=rev Log: show only update stack patches if there are any Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchFilterView.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchFilterView.h branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchList.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchList.h Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPk… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchFilterView.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchFilterView.cc Thu Aug 2 17:51:49 2007 @@ -53,6 +53,7 @@ : QVBox( parent ) { QVBox * vbox; + _haveUpdateStackPatches = YQPkgPatchList::haveUpdateStackPatches(); _splitter = new QSplitter( QSplitter::Vertical, this ); CHECK_PTR( _splitter ); vbox = new QVBox( _splitter ); CHECK_PTR( vbox ); @@ -68,9 +69,15 @@ _patchFilter = new QComboBox( hbox ); CHECK_PTR( _patchFilter ); - _patchFilter->insertItem( _( "Installable Patches" ), 0 ); - _patchFilter->insertItem( _( "Installable and Installed Patches" ), 1 ); - _patchFilter->insertItem( _( "All Patches" ), 2 ); + int index = 0; + + if ( _haveUpdateStackPatches ) + // Translators: This is about patches that patch the update engine (libzypp, YaST) itself + _patchFilter->insertItem( _( "Update Stack Patches" ), index++ ); + + _patchFilter->insertItem( _( "Installable Patches" ), index++ ); + _patchFilter->insertItem( _( "Installable and Installed Patches" ), index++ ); + _patchFilter->insertItem( _( "All Patches" ), index++ ); _patchFilter->setCurrentItem( 0 ); _patchFilter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert label->setBuddy( _patchFilter ); @@ -118,6 +125,7 @@ connect( _patchList, SIGNAL( statusChanged() ), this, SLOT ( updateTotalDownloadSize() ) ); + fillPatchList(); updateTotalDownloadSize(); } @@ -210,8 +218,14 @@ void YQPkgPatchFilterView::fillPatchList() { - switch ( _patchFilter->currentItem() ) + int currentIndex = _patchFilter->currentItem(); + + if ( _haveUpdateStackPatches ) + currentIndex--; + + switch ( currentIndex ) { + case -1: _patchList->setFilterCriteria( YQPkgPatchList::UpdateStackPatches ); break; case 0: _patchList->setFilterCriteria( YQPkgPatchList::RelevantPatches ); break; case 1: _patchList->setFilterCriteria( YQPkgPatchList::RelevantAndInstalledPatches ); break; case 2: _patchList->setFilterCriteria( YQPkgPatchList::AllPatches ); break; Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPk… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchFilterView.h (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchFilterView.h Thu Aug 2 17:51:49 2007 @@ -90,6 +90,7 @@ QLabel * _totalDownloadSize; YQPkgSelMapper _selMapper; + bool _haveUpdateStackPatches; }; Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPk… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchList.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchList.cc Thu Aug 2 17:51:49 2007 @@ -34,7 +34,8 @@ #include "YQPkgTextDialog.h" -#define VERBOSE_PATCH_LIST 1 +#define VERBOSE_PATCH_LIST 1 +#define DEBUG_SHOW_ALL_UPDATE_STACK_PATCHES 0 typedef zypp::ui::PatchContents ZyppPatchContents; @@ -72,7 +73,6 @@ this, SLOT ( filter() ) ); setSorting( categoryCol() ); - fillList(); y2debug( "Creating patch list done" ); } @@ -122,6 +122,35 @@ switch ( _filterCriteria ) { + case UpdateStackPatches: + + if ( zyppPatch->affects_pkg_manager() ) + { +#if DEBUG_SHOW_ALL_UPDATE_STACK_PATCHES + displayPatch = true; +#endif + if ( selectable->hasCandidateObj() && + selectable->candidatePoolItem().status().isNeeded() ) + { + displayPatch = true; + + y2milestone( "Found YaST patch that should be installed: %s - %s", + zyppPatch->name().c_str(), + zyppPatch->summary().c_str() ); + } + + if ( selectable->hasInstalledObj() && + selectable->installedPoolItem().status().isIncomplete() ) // patch broken? + { + displayPatch = true; + + y2warning( "Installed YaST patch is broken: %s - %s", + zyppPatch->name().c_str(), + zyppPatch->summary().c_str() ); + } + } + break; + case RelevantPatches: // needed + broken + satisfied (but not installed) if ( selectable->hasInstalledObj() ) // installed? @@ -347,6 +376,34 @@ } +bool +YQPkgPatchList::haveUpdateStackPatches() +{ + for ( ZyppPoolIterator it = zyppPatchesBegin(); + it != zyppPatchesEnd(); + ++it ) + { + ZyppSel selectable = *it; + ZyppPatch zyppPatch = tryCastToZyppPatch( selectable->theObj() ); + + if ( zyppPatch && zyppPatch->affects_pkg_manager() ) + { +#if DEBUG_SHOW_ALL_UPDATE_STACK_PATCHES + return true; +#else + if ( selectable->hasCandidateObj() && + selectable->candidatePoolItem().status().isNeeded() ) + { + return true; + } +#endif + } + } + + return false; +} + + YQPkgPatchListItem * YQPkgPatchList::selection() const { Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPk… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchList.h (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgPatchList.h Thu Aug 2 17:51:49 2007 @@ -66,6 +66,7 @@ enum FilterCriteria { + UpdateStackPatches, // zypp or YaST2 RelevantPatches, // needed + broken RelevantAndInstalledPatches, // needed + broken + installed AllPatches // all @@ -111,6 +112,12 @@ public: /** + * Return 'true' if there is any patch for the update stack in the pool + * that is not installed yet or that could be updated. + **/ + static bool haveUpdateStackPatches(); + + /** * Set the filter criteria for fillList(). **/ void setFilterCriteria( FilterCriteria filterCriteria ); -- 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] r39914 - /tags/stable-2_15_11/samba-client/
by jsuchome＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: jsuchome Date: Thu Aug 2 17:49:18 2007 New Revision: 39914 URL: http://svn.opensuse.org/viewcvs/yast?rev=39914&view=rev Log: Created tag stable-2_15_11 for samba-client Added: tags/stable-2_15_11/samba-client/ - copied from r39913, trunk/samba-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0