Author: rpmcruz
Date: Tue Sep 9 06:45:58 2008
New Revision: 50832
URL: http://svn.opensuse.org/viewcvs/yast?rev=50832&view=rev
Log:
* src/yzyppwrapper.cc: fixed repositories query (related to bug 418781).
Was using some duplicated zypp API that is dysfunctional it seems.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/yzyppwrapper.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=50832&r1=50831&r2=50832&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Tue Sep 9 06:45:58 2008
@@ -15,6 +15,9 @@
* src/YGUI.cc: redirect GTK log messages to libyui system.
* src/ygtkrichtext.c: enable html parsing warnings that go to libyui.
+ * src/yzyppwrapper.cc: fixed repositories query (related to bug 418781).
+ Was using some duplicated zypp API that is dysfunctional it seems.
+
2008-09-08 JP Rosevear
* Version 2.16.18
Modified: trunk/gtk/src/yzyppwrapper.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=50832&r1=50831&r2=50832&view=diff
==============================================================================
--- trunk/gtk/src/yzyppwrapper.cc (original)
+++ trunk/gtk/src/yzyppwrapper.cc Tue Sep 9 06:45:58 2008
@@ -1836,16 +1836,18 @@
const Ypp::Repository *Ypp::Impl::getRepository (int nb)
{
if (!repos) {
- zypp::RepoManager manager;
- std::list zypp::RepoInfo zrepos = manager.knownRepositories();
- for (std::list zypp::RepoInfo::const_iterator it = zrepos.begin();
- it != zrepos.end(); it++) {
+ for (zypp::ResPoolProxy::repository_iterator it = zyppPool().knownRepositoriesBegin();
+ it != zyppPool().knownRepositoriesEnd(); it++) {
+ const zypp::Repository &zrepo = *it;
+ if (zrepo.isSystemRepo())
+ continue;
+ const zypp::RepoInfo info = zrepo.info();
Repository *repo = new Repository();
- repo->name = it->name();
- if (!it->baseUrlsEmpty())
- repo->url = it->baseUrlsBegin()->asString();
- repo->alias = it->alias();
- repo->enabled = it->enabled();
+ repo->name = info.name();
+ if (!info.baseUrlsEmpty())
+ repo->url = info.baseUrlsBegin()->asString();
+ repo->alias = info.alias();
+ repo->enabled = info.enabled();
repos = g_slist_append (repos, repo);
}
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
