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&r2=61857&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Sat Apr 24 00:15:01 2010
@@ -1,5 +1,9 @@
2010-04-22 Ricardo Cruz
+ * src/pkg/ygtkhistorydialog.cc: fixed potential crash.
+
+2010-04-22 Ricardo Cruz
+
* 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?rev=61857&r1=61856&r2=61857&view=diff
==============================================================================
--- 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@alunos.dcc.fc.up.pt
+
+- 2.21.50
+- sw_single: history window: fixed potential crash.
+
+-------------------------------------------------------------------
Fri Apr 23 20:16:00 WET 2010 - rpmcruz@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@alunos.dcc.fc.up.pt
Modified: trunk/gtk/src/pkg/ygtkpkghistorydialog.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkghistorydialog.cc?rev=61857&r1=61856&r2=61857&view=diff
==============================================================================
--- 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 ::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@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
