[yum-cvs] yum-metadata-parser ChangeLog, 1.7, 1.8 sqlitecache.c, 1.7, 1.8

[James Bowes]

Update of /home/groups/yum/cvs/yum-metadata-parser
In directory login1.linux.duke.edu:/tmp/cvs-serv15608

Modified Files:
	ChangeLog sqlitecache.c 
Log Message:
2007-12-04 13:10 jbowes

	* sqlitecache.c: Never use the default glib log handler. This way, when
	-d0 is passed, we won't output to the glib log handler (since nothing
	should be displayed at all).



Index: ChangeLog
===================================================================
RCS file: /home/groups/yum/cvs/yum-metadata-parser/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog	23 Nov 2006 01:28:24 -0000	1.7
+++ ChangeLog	4 Jan 2007 18:20:51 -0000	1.8
@@ -1,3 +1,9 @@
+2007-12-04 13:10 jbowes
+
+	* sqlitecache.c: Never use the default glib log handler. This way, when
+	-d0 is passed, we won't output to the glib log handler (since nothing
+	should be displayed at all).
+
 2006-11-22 20:23  jbowes
 
 	* sqlitecache.c: Use structs and function pointers to reduce code

Index: sqlitecache.c
===================================================================
RCS file: /home/groups/yum/cvs/yum-metadata-parser/sqlitecache.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sqlitecache.c	23 Nov 2006 01:28:24 -0000	1.7
+++ sqlitecache.c	4 Jan 2007 18:20:51 -0000	1.8
@@ -470,6 +470,9 @@
     PyObject *args;
     PyObject *result;
 
+    if (!callback)
+        return;
+
     args = PyTuple_New (2);
 
     switch (log_level) {
@@ -513,17 +516,14 @@
                         &repoid))
         return NULL;
 
-    if (log) {
-        GLogLevelFlags level = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_WARNING |
-            G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_DEBUG;
-        log_id = g_log_set_handler (NULL, level, log_cb, log);
-    }
+    GLogLevelFlags level = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_WARNING |
+        G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_DEBUG;
+    log_id = g_log_set_handler (NULL, level, log_cb, log);
 
     db_filename = update_packages (update_info, md_filename, checksum,
                                    progress, repoid, &err);
 
-    if (log_id)
-        g_log_remove_handler (NULL, log_id);
+    g_log_remove_handler (NULL, log_id);
 
     if (db_filename) {
         ret = PyString_FromString (db_filename);