Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at 2014-04-23 17:31:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-runtime (Old) and /work/SRC/openSUSE:Factory/.akonadi-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-runtime/akonadi-runtime.changes 2014-04-08 22:36:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-runtime.new/akonadi-runtime.changes 2014-04-23 17:31:02.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 22 10:09:03 UTC 2014 - hrvoje.sen...@gmail.com + +- Added 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch, + resolves migration problems from earlier akonadi versions, kde#331867 + +------------------------------------------------------------------- New: ---- 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.n0JvTK/_old 2014-04-23 17:31:03.000000000 +0200 +++ /var/tmp/diff_new_pack.n0JvTK/_new 2014-04-23 17:31:03.000000000 +0200 @@ -25,6 +25,8 @@ Group: System/GUI/KDE Url: http://akonadi-project.org Source: http://download.kde.org/stable/%{rname}/src/%{rname}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch -- resolves migration problems from earlier akonadi versions, kde#331867 +Patch0: 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch BuildRequires: boost-devel BuildRequires: cmake >= 2.8.8 BuildRequires: fdupes @@ -68,6 +70,7 @@ %prep %setup -q -n %{rname}-%{version} +%patch0 -p1 %build %cmake_kde4 -d build -- -DCONFIG_INSTALL_DIR=/etc -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DWITH_SOPRANO=FALSE ++++++ 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch ++++++ >From 4ca8b846baaad48ebbd723f6411f9571a3b0f5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvra...@redhat.com> Date: Tue, 22 Apr 2014 11:28:07 +0200 Subject: [PATCH 1/1] Remove the invalid GID part from PartTable before starting PartTable migration More people than we expected have invalid 'GID' part in their PartTable, which breaks migration to schema 25, because it expects all part types to have a valid name. To work around this fact, we DELETE all parts with name 'GID' from PartTable before starting the actual migration. This will not fix the migration for people with other invalid parts, but I haven't heard of any such. To make this completely bullet-proof, we would need to iterate through all entries, which would be massively slower than current INSERT INTO ... SELECT FROM approach. Distributions, this is a good choice for backporting into 1.12.1 ;-) BUG: 331867 FIXED-IN: 1.12.2 --- server/src/storage/dbupdater.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/server/src/storage/dbupdater.cpp b/server/src/storage/dbupdater.cpp index ccaf584..d6368b5 100644 --- a/server/src/storage/dbupdater.cpp +++ b/server/src/storage/dbupdater.cpp @@ -261,6 +261,15 @@ bool DbUpdater::complexUpdate_25() } } + { + // It appears that more users than expected have the invalid "GID" part in their + // PartTable, which breaks the migration below (see BKO#331867), so we apply this + // wanna-be fix to remove the invalid part before we start the actual migration. + QueryBuilder qb( QLatin1String( "PartTable" ), QueryBuilder::Delete ); + qb.addValueCondition( QLatin1String( "PartTable.name" ), Query::Equals, QLatin1String( "GID" ) ); + qb.exec(); + } + akDebug() << "Creating a PartTable_new"; { TableDescription description; -- 1.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
