rpms/yum-metadata-parser/F-9 yum-metadata-parser-1.1.2-no-updates.patch, NONE, 1.1 yum-metadata-parser.spec, 1.24, 1.25

[James Antill]

Author: james

Update of /cvs/pkgs/rpms/yum-metadata-parser/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10510

Modified Files:
	yum-metadata-parser.spec 
Added Files:
	yum-metadata-parser-1.1.2-no-updates.patch 
Log Message:
* Wed Oct 15 2008 James Antill <james at fedoraproject.org> 1.1.2-9
- Add no updates patches from upstream.
- Resolves: bug#465898


yum-metadata-parser-1.1.2-no-updates.patch:

--- NEW FILE yum-metadata-parser-1.1.2-no-updates.patch ---
commit c5033bfe5484ec3ecd49f1bf8801c6a8163df482
Author: James Antill <james at and.org>
Date:   Tue Oct 14 13:13:54 2008 -0400

    Turn off .sqlite updating from new .xml data, bug 465898

diff --git a/db.c b/db.c
index a6af904..a1e4fe8 100644
--- a/db.c
+++ b/db.c
@@ -19,6 +19,11 @@
 #include <unistd.h>
 #include "db.h"
 
+/*  We have a lot of code so we can "quickly" update the .sqlite file using
+ * the old .sqlite data and the new .xml data. However it seems to have weird
+ * edge cases where it doesn't work, rhbz 465898 etc. ... so we turn it off. */
+#define YMP_CONFIG_UPDATE_DB 0
+
 GQuark
 yum_db_error_quark (void)
 {
@@ -196,10 +201,13 @@ yum_db_open (const char *path,
                 return NULL;
                 break;
             case DB_STATUS_CHECKSUM_MISMATCH:
-                sqlite3_exec (db, "PRAGMA synchronous = 0", NULL, NULL, NULL);
-                sqlite3_exec (db, "DELETE FROM db_info", NULL, NULL, NULL);
-                return db;
-                break;
+                if (YMP_CONFIG_UPDATE_DB) {
+                    sqlite3_exec (db, "PRAGMA synchronous = 0", NULL,NULL,NULL);
+                    sqlite3_exec (db, "DELETE FROM db_info", NULL, NULL, NULL);
+                    return db;
+                    break;
+                }
+                /* FALL THROUGH */
             case DB_STATUS_VERSION_MISMATCH:
             case DB_STATUS_ERROR:
                 sqlite3_close (db);


Index: yum-metadata-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-metadata-parser/F-9/yum-metadata-parser.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- yum-metadata-parser.spec	14 Feb 2008 13:19:21 -0000	1.24
+++ yum-metadata-parser.spec	15 Oct 2008 14:30:56 -0000	1.25
@@ -4,10 +4,11 @@
 Summary: A fast metadata parser for yum
 Name: yum-metadata-parser
 Version: 1.1.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: http://linux.duke.edu/projects/yum/download/%{name}/%{name}-%{version}.tar.gz
 Patch0: yum-metadata-parser-1.1.2-null-pkgid.patch
 Patch1: yum-metadata-parser-exclusive-lock.patch
+Patch3: yum-metadata-parser-1.1.2-no-updates.patch
 License: GPLv2
 Group: Development/Libraries
 URL: http://linux.duke.edu/projects/yum/
@@ -27,6 +28,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch3 -p1
 
 %build
 %{__python} setup.py build
@@ -49,6 +51,10 @@
 %{python_sitelib_platform}/*egg-info
 
 %changelog
+* Wed Oct 15 2008 James Antill <james at fedoraproject.org> 1.1.2-9
+- Add no updates patches from upstream.
+- Resolves: bug#465898
+
 * Thu Feb 14 2008 Seth Vidal <skvidal at fedoraproject.org> 1.1.2-8
 - bump for gcc