Hello community, here is the log from the commit of package evolution for openSUSE:Factory checked in at Thu Oct 13 12:18:49 CEST 2011.
-------- --- openSUSE:Factory/evolution/evolution.changes 2011-10-07 00:46:44.000000000 +0200 +++ evolution/evolution.changes 2011-10-12 14:15:48.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 12 09:49:37 UTC 2011 - [email protected] + +- Add evolution-fix-cannot-upgrade-random.patch: fix "Cannot + upgrade from version <random>" on initial startup. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- evolution-fix-cannot-upgrade-random.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.hsJz5J/_old 2011-10-13 12:18:43.000000000 +0200 +++ /var/tmp/diff_new_pack.hsJz5J/_new 2011-10-13 12:18:43.000000000 +0200 @@ -77,6 +77,8 @@ # FIXME: check with upstream/meego if we want to enable clutter for express mode Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source0: http://download.gnome.org/sources/evolution/3.2/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM evolution-fix-cannot-upgrade-random.patch [email protected] -- Properly initialize memory to avoid weird "Cannot upgrade from version <random>" dialog +Patch0: evolution-fix-cannot-upgrade-random.patch # PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch [email protected] -- look for ldap includes in %{_libdir}/evoldap/include Patch15: evolution-custom-openldap-includes.patch # PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 [email protected] -- Book URI: Spills Into Second Column. @@ -171,6 +173,7 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 %if %USE_EVOLDAP %patch15 -p1 %endif ++++++ evolution-fix-cannot-upgrade-random.patch ++++++ commit 5645064bb35802aa9e9167cac5223fddb8852859 Author: Vincent Untz <[email protected]> Date: Wed Oct 12 11:46:54 2011 +0200 Correctly initialize the variables when checking version update Else, we end up with non-initialized memory and "Cannot upgrade from version <random data>". https://bugzilla.gnome.org/show_bug.cgi?id=661542 diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index 89f94b0..dd75a40 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.c @@ -739,6 +739,10 @@ shell_migrate_get_version (EShell *shell, const gchar *key; gchar *string; + *major = 0; + *minor = 0; + *micro = 0; + key = GCONF_VERSION_KEY; client = e_shell_get_gconf_client (shell); string = gconf_client_get_string (client, key, NULL); @@ -747,12 +751,6 @@ shell_migrate_get_version (EShell *shell, /* Since 1.4.0 we've kept the version key in GConf. */ sscanf (string, "%d.%d.%d", major, minor, micro); g_free (string); - - } else { - /* Otherwise, assume it's a new installation. */ - *major = 0; - *minor = 0; - *micro = 0; } } continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
