April 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r61864 - /tags/stable-2_21_51/gtk/
by rpmcruz＠svn.opensuse.org 25 Apr '10

25 Apr '10

Author: rpmcruz Date: Sun Apr 25 11:47:30 2010 New Revision: 61864 URL: http://svn.opensuse.org/viewcvs/yast?rev=61864&view=rev Log: Created tag stable-2_21_51 for gtk Added: tags/stable-2_21_51/gtk/ - copied from r61863, trunk/gtk/ -- 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] r61863 - /tags/stable-2_21_51/
by rpmcruz＠svn.opensuse.org 25 Apr '10

25 Apr '10

Author: rpmcruz Date: Sun Apr 25 11:47:24 2010 New Revision: 61863 URL: http://svn.opensuse.org/viewcvs/yast?rev=61863&view=rev Log: Created tag stable-2_21_51 Added: tags/stable-2_21_51/ -- 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] r61862 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 25 Apr '10

25 Apr '10

Author: rpmcruz Date: Sun Apr 25 11:47:22 2010 New Revision: 61862 URL: http://svn.opensuse.org/viewcvs/yast?rev=61862&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=61862&r1=61861&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Sun Apr 25 11:47:22 2010 @@ -1 +1 @@ -2.21.50 +2.21.51 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=61862&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Sun Apr 25 11:47:22 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "50") +SET(VERSION_PATCH "51") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Sun Apr 25 11:47:22 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sun Apr 25 10:48:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.51 +- sw_single: upgrades: don't lose patch information after +package is set for upgrade. + +------------------------------------------------------------------- Fri Apr 23 23:15:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.50 -- 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] r61861 - in /trunk/gtk: ChangeLog src/pkg/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 25 Apr '10

25 Apr '10

Author: rpmcruz Date: Sun Apr 25 11:46:16 2010 New Revision: 61861 URL: http://svn.opensuse.org/viewcvs/yast?rev=61861&view=rev Log: * src/pkg/yzyppwrapper.cc: bug fix: remember patch status. Modified: trunk/gtk/ChangeLog trunk/gtk/src/pkg/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=61861&r1=61860… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sun Apr 25 11:46:16 2010 @@ -1,3 +1,7 @@ +2010-04-25 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/yzyppwrapper.cc: bug fix: remember patch status. + 2010-04-22 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/ygtkhistorydialog.cc: fixed potential crash. Modified: trunk/gtk/src/pkg/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.cc?rev=… ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.cc (original) +++ trunk/gtk/src/pkg/yzyppwrapper.cc Sun Apr 25 11:46:16 2010 @@ -668,15 +668,25 @@ return pkg->group(); } -static ZyppSelectable _getCandidatePatch (Ypp::Selectable &sel) +static std::map <std::string, ZyppSelectable> g_selPatch; + +static ZyppSelectable getSelPatch (Ypp::Selectable &sel) { - ZyppSelectable zpatch = 0; + std::string name (sel.name()); + std::map <std::string, ZyppSelectable>::iterator it = g_selPatch.find (name); + if (it != g_selPatch.end()) + return it->second; + Ypp::PoolQuery query (Ypp::Selectable::PATCH); query.addCriteria (new Ypp::StatusMatch (Ypp::StatusMatch::NOT_INSTALLED)); query.addCriteria (new Ypp::CollectionContainsMatch (sel)); - if (query.hasNext()) - zpatch = query.next().zyppSel(); - return zpatch; + if (query.hasNext()) { + Ypp::Selectable patch = query.next(); + g_selPatch[name] = patch.zyppSel(); + } + else + g_selPatch[name] = NULL; + return g_selPatch[name]; } bool Ypp::Package::isCandidatePatch() @@ -684,13 +694,13 @@ if (m_sel.hasCandidateVersion() && m_sel.hasInstalledVersion()) { Ypp::Version candidate (m_sel.candidate()), installed (m_sel.installed()); if (candidate > installed) - return _getCandidatePatch (m_sel) != 0; + return getSelPatch (m_sel) != NULL; } return false; } Ypp::Selectable Ypp::Package::getCandidatePatch() -{ return Ypp::Selectable (_getCandidatePatch (m_sel)); } +{ return Selectable (getSelPatch (m_sel)); } // Patch @@ -1439,5 +1449,6 @@ g_busy_running = false; g_patternsContent.clear(); g_languagesContent.clear(); + g_selPatch.clear(); } -- 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] r61860 - /tags/stable-2_21_50/gtk/
by rpmcruz＠svn.opensuse.org 23 Apr '10

23 Apr '10

Author: rpmcruz Date: Sat Apr 24 00:15:27 2010 New Revision: 61860 URL: http://svn.opensuse.org/viewcvs/yast?rev=61860&view=rev Log: Created tag stable-2_21_50 for gtk Added: tags/stable-2_21_50/gtk/ - copied from r61859, trunk/gtk/ -- 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] r61859 - /tags/stable-2_21_50/
by rpmcruz＠svn.opensuse.org 23 Apr '10

23 Apr '10

Author: rpmcruz Date: Sat Apr 24 00:15:21 2010 New Revision: 61859 URL: http://svn.opensuse.org/viewcvs/yast?rev=61859&view=rev Log: Created tag stable-2_21_50 Added: tags/stable-2_21_50/ -- 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] r61858 - in /trunk/gtk: VERSION VERSION.cmake
by rpmcruz＠svn.opensuse.org 23 Apr '10

23 Apr '10

Author: rpmcruz Date: Sat Apr 24 00:15:18 2010 New Revision: 61858 URL: http://svn.opensuse.org/viewcvs/yast?rev=61858&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=61858&r1=61857&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Sat Apr 24 00:15:18 2010 @@ -1 +1 @@ -2.21.49 +2.21.50 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=61858&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Sat Apr 24 00:15:18 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "49") +SET(VERSION_PATCH "50") -- 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] r61857 - in /trunk/gtk: ChangeLog package/yast2-gtk.changes src/pkg/ygtkpkghistorydialog.cc
by rpmcruz＠svn.opensuse.org 23 Apr '10

23 Apr '10

Author: rpmcruz Date: Sat Apr 24 00:15:01 2010 New Revision: 61857 URL: http://svn.opensuse.org/viewcvs/yast?rev=61857&view=rev Log: * src/pkg/ygtkhistorydialog.cc: fixed potential crash. Modified: trunk/gtk/ChangeLog trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/pkg/ygtkpkghistorydialog.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=61857&r1=61856… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Apr 24 00:15:01 2010 @@ -1,5 +1,9 @@ 2010-04-22 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + * src/pkg/ygtkhistorydialog.cc: fixed potential crash. + +2010-04-22 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + * src/pkg/ygtkhistorydialog.cc: bug fix: show downgrades and re-installs as such, not upgrades. Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Sat Apr 24 00:15:01 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 23 23:15:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.50 +- sw_single: history window: fixed potential crash. + +------------------------------------------------------------------- Fri Apr 23 20:16:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.49 @@ -6,6 +12,7 @@ re-installs as such, not upgrades. - sw_single list: show patch mark next to version number, not name. + ------------------------------------------------------------------- Fri Apr 23 12:16:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt Modified: trunk/gtk/src/pkg/ygtkpkghistorydialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkghistorydialog… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkghistorydialog.cc (original) +++ trunk/gtk/src/pkg/ygtkpkghistorydialog.cc Sat Apr 24 00:15:01 2010 @@ -280,17 +280,20 @@ getRepositoryInfo (_item->repoalias, repoName, repoUrl); reqby = _item->reqby; autoreq = reqby.empty(); reqby = reqbyTreatment (reqby); + zypp::Edition edition = _item->edition; std::map <std::string, zypp::Edition>::iterator it; it = installed.find (name); - zypp::Edition edition = _item->edition, prev_edition = it->second; if (it == installed.end()) action = _("install"); - else if (edition > prev_edition) - action = _("upgrade"); - else if (edition < prev_edition) - action = _("downgrade"); - else // (edition == prev_edition) - action = _("re-install"); + else { + zypp::Edition prev_edition = it->second; + if (edition > prev_edition) + action = _("upgrade"); + else if (edition < prev_edition) + action = _("downgrade"); + else // (edition == prev_edition) + action = _("re-install"); + } installed[name] = edition; break; } -- 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] r61856 - /tags/stable-2_21_49/gtk/
by rpmcruz＠svn.opensuse.org 23 Apr '10

23 Apr '10

Author: rpmcruz Date: Fri Apr 23 21:16:20 2010 New Revision: 61856 URL: http://svn.opensuse.org/viewcvs/yast?rev=61856&view=rev Log: Created tag stable-2_21_49 for gtk Added: tags/stable-2_21_49/gtk/ - copied from r61855, trunk/gtk/ -- 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] r61855 - /tags/stable-2_21_49/
by rpmcruz＠svn.opensuse.org 23 Apr '10

23 Apr '10

Author: rpmcruz Date: Fri Apr 23 21:16:14 2010 New Revision: 61855 URL: http://svn.opensuse.org/viewcvs/yast?rev=61855&view=rev Log: Created tag stable-2_21_49 Added: tags/stable-2_21_49/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0