[yum-cvs] yum-metadata-parser ChangeLog, 1.1, 1.2 db.c, 1.3, 1.4 setup.py, 1.2, 1.3 sqlitecache.c, 1.4, 1.5 xml-parser.c, 1.3, 1.4 debug.c, 1.2, NONE debug.h, 1.2, NONE
Tambet Ingo
tambet at linux.duke.edu
Wed May 24 20:03:13 UTC 2006
Update of /home/groups/yum/cvs/yum-metadata-parser
In directory login1.linux.duke.edu:/tmp/cvs-serv8935
Modified Files:
ChangeLog db.c setup.py sqlitecache.c xml-parser.c
Removed Files:
debug.c debug.h
Log Message:
2006-05-24 Tambet Ingo <tambet at ximian.com>
* debug.[ch]: Remove. No need for our own logging framework, glib
already has one.
*.[ch]: Use glib messaging/logging functions instead of debug_*.
* sqlitecache.c: A small cleanup to get rid of some awfully similar
looking code.
Index: ChangeLog
===================================================================
RCS file: /home/groups/yum/cvs/yum-metadata-parser/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog 24 May 2006 14:20:19 -0000 1.1
+++ ChangeLog 24 May 2006 20:03:10 -0000 1.2
@@ -1,5 +1,13 @@
2006-05-24 Tambet Ingo <tambet at ximian.com>
+ * debug.[ch]: Remove. No need for our own logging framework, glib
+ already has one.
+
+ *.[ch]: Use glib messaging/logging functions instead of debug_*.
+
+ * sqlitecache.c: A small cleanup to get rid of some awfully similar
+ looking code.
+
* ChangeLog: Start keeping change log.
* sqlitecache.c (update_primary): Nullify the update info structure,
@@ -9,4 +17,3 @@
* db.c (yum_db_open): Delete the cache file if the dbversion
does not match.
-
Index: db.c
===================================================================
RCS file: /home/groups/yum/cvs/yum-metadata-parser/db.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- db.c 24 May 2006 14:20:19 -0000 1.3
+++ db.c 24 May 2006 20:03:11 -0000 1.4
@@ -18,7 +18,6 @@
#include <string.h>
#include <unistd.h>
#include "db.h"
-#include "debug.h"
GQuark
yum_db_error_quark (void)
@@ -139,13 +138,11 @@
dbchecksum = (const char *) sqlite3_column_text (handle, 1);
if (dbversion != YUM_SQLITE_CACHE_DBVERSION) {
- debug (DEBUG_LEVEL_INFO,
- "Warning: cache file is version %d, we need %d, will regenerate",
- dbversion, YUM_SQLITE_CACHE_DBVERSION);
+ g_message ("Warning: cache file is version %d, we need %d, will regenerate",
+ dbversion, YUM_SQLITE_CACHE_DBVERSION);
status = DB_STATUS_VERSION_MISMATCH;
} else if (strcmp (checksum, dbchecksum)) {
- debug (DEBUG_LEVEL_INFO,
- "sqlite cache needs updating, reading in metadata\n");
+ g_message ("sqlite cache needs updating, reading in metadata");
status = DB_STATUS_CHECKSUM_MISMATCH;
} else
status = DB_STATUS_OK;
@@ -502,9 +499,8 @@
sqlite3_reset (handle);
if (rc != SQLITE_DONE) {
- debug (DEBUG_LEVEL_ERROR,
- "Error adding package to SQL: %s",
- sqlite3_errmsg (db));
+ g_critical ("Error adding package to SQL: %s",
+ sqlite3_errmsg (db));
} else
p->pkgKey = sqlite3_last_insert_rowid (db);
}
@@ -555,9 +551,8 @@
sqlite3_reset (handle);
if (rc != SQLITE_DONE)
- debug (DEBUG_LEVEL_ERROR,
- "Error adding dependency to SQL: %s",
- sqlite3_errmsg (db));
+ g_critical ("Error adding dependency to SQL: %s",
+ sqlite3_errmsg (db));
}
sqlite3_stmt *
@@ -598,9 +593,8 @@
sqlite3_reset (handle);
if (rc != SQLITE_DONE)
- debug (DEBUG_LEVEL_ERROR,
- "Error adding package file to SQL: %s",
- sqlite3_errmsg (db));
+ g_critical ("Error adding package file to SQL: %s",
+ sqlite3_errmsg (db));
}
void
@@ -698,9 +692,8 @@
sqlite3_reset (handle);
if (rc != SQLITE_DONE) {
- debug (DEBUG_LEVEL_ERROR,
- "Error adding package to SQL: %s",
- sqlite3_errmsg (db));
+ g_critical ("Error adding package to SQL: %s",
+ sqlite3_errmsg (db));
} else
p->pkgKey = sqlite3_last_insert_rowid (db);
}
@@ -750,9 +743,8 @@
sqlite3_reset (info->handle);
if (rc != SQLITE_DONE) {
- debug (DEBUG_LEVEL_ERROR,
- "Error adding file to SQL: %s",
- sqlite3_errmsg (info->db));
+ g_critical ("Error adding file to SQL: %s",
+ sqlite3_errmsg (info->db));
}
}
@@ -878,9 +870,8 @@
sqlite3_reset (handle);
if (rc != SQLITE_DONE) {
- debug (DEBUG_LEVEL_ERROR,
- "Error adding changelog to SQL: %s",
- sqlite3_errmsg (db));
+ g_critical ("Error adding changelog to SQL: %s",
+ sqlite3_errmsg (db));
}
}
}
Index: setup.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-metadata-parser/setup.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setup.py 24 May 2006 12:49:16 -0000 1.2
+++ setup.py 24 May 2006 20:03:11 -0000 1.3
@@ -17,8 +17,7 @@
include_dirs = includes,
libraries = libs,
library_dirs = libdirs,
- sources = ['debug.c',
- 'package.c',
+ sources = ['package.c',
'xml-parser.c',
'db.c',
'sqlitecache.c'])
Index: sqlitecache.c
===================================================================
RCS file: /home/groups/yum/cvs/yum-metadata-parser/sqlitecache.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sqlitecache.c 24 May 2006 14:20:19 -0000 1.4
+++ sqlitecache.c 24 May 2006 20:03:11 -0000 1.5
@@ -17,7 +17,6 @@
#include <Python.h>
-#include "debug.h"
#include "xml-parser.h"
#include "db.h"
#include "package.h"
@@ -82,9 +81,8 @@
sqlite3_reset (info->remove_handle);
if (rc != SQLITE_DONE)
- debug (DEBUG_LEVEL_WARNING,
- "Error removing package from SQL: %s",
- sqlite3_errmsg (info->db));
+ g_warning ("Error removing package from SQL: %s",
+ sqlite3_errmsg (info->db));
info->del_count++;
}
@@ -118,10 +116,9 @@
g_timer_stop (info->timer);
if (!*err) {
- debug (DEBUG_LEVEL_INFO,
- "Added %d new packages, deleted %d old in %.2f seconds",
- info->add_count, info->del_count,
- g_timer_elapsed (info->timer, NULL));
+ g_message ("Added %d new packages, deleted %d old in %.2f seconds",
+ info->add_count, info->del_count,
+ g_timer_elapsed (info->timer, NULL));
}
g_timer_destroy (info->timer);
@@ -551,15 +548,34 @@
}
static void
-debug_cb (const char *message,
- DebugLevel level,
- gpointer user_data)
+log_cb (const gchar *log_domain,
+ GLogLevelFlags log_level,
+ const gchar *message,
+ gpointer user_data)
{
PyObject *callback = (PyObject *) user_data;
+ int level;
PyObject *args;
PyObject *result;
args = PyTuple_New (2);
+
+ switch (log_level) {
+ case G_LOG_LEVEL_DEBUG:
+ level = 2;
+ break;
+ case G_LOG_LEVEL_MESSAGE:
+ level = 1;
+ break;
+ case G_LOG_LEVEL_WARNING:
+ level = 0;
+ break;
+ case G_LOG_LEVEL_CRITICAL:
+ default:
+ level = -1;
+ break;
+ }
+
PyTuple_SET_ITEM (args, 0, PyInt_FromLong (level));
PyTuple_SET_ITEM (args, 1, PyString_FromString (message));
@@ -568,14 +584,20 @@
Py_XDECREF (result);
}
+typedef char * (*UpdateFn) (const char *md_filename,
+ const char *checksum,
+ ProgressFn progress_fn,
+ gpointer user_data,
+ GError **err);
+
static PyObject *
-py_update_primary (PyObject *self, PyObject *args)
+py_update (PyObject *self, PyObject *args, UpdateFn update_fn)
{
const char *md_filename = NULL;
const char *checksum = NULL;
PyObject *log = NULL;
PyObject *progress = NULL;
- int log_id = 0;
+ guint log_id = 0;
char *db_filename;
PyObject *ret = NULL;
GError *err = NULL;
@@ -583,17 +605,18 @@
if (!py_parse_args (args, &md_filename, &checksum, &log, &progress))
return NULL;
- if (log)
- log_id = debug_add_handler (debug_cb, log);
+ 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);
+ }
- db_filename = update_primary (md_filename,
- checksum,
- progress != NULL ? progress_cb : NULL,
- progress,
- &err);
+ db_filename = update_fn (md_filename, checksum,
+ progress != NULL ? progress_cb : NULL,
+ progress, &err);
if (log_id)
- debug_remove_handler (log_id);
+ g_log_remove_handler (NULL, log_id);
if (db_filename) {
ret = PyString_FromString (db_filename);
@@ -606,80 +629,23 @@
return ret;
}
+
static PyObject *
-py_update_filelist (PyObject *self, PyObject *args)
+py_update_primary (PyObject *self, PyObject *args)
{
- const char *md_filename = NULL;
- const char *checksum = NULL;
- PyObject *log = NULL;
- PyObject *progress = NULL;
- int log_id = 0;
- char *db_filename;
- PyObject *ret = NULL;
- GError *err = NULL;
-
- if (!py_parse_args (args, &md_filename, &checksum, &log, &progress))
- return NULL;
-
- if (log)
- log_id = debug_add_handler (debug_cb, log);
-
- db_filename = update_filelist (md_filename,
- checksum,
- progress != NULL ? progress_cb : NULL,
- progress,
- &err);
-
- if (log_id)
- debug_remove_handler (log_id);
-
- if (db_filename) {
- ret = PyString_FromString (db_filename);
- g_free (db_filename);
- } else {
- PyErr_SetString (PyExc_TypeError, err->message);
- g_error_free (err);
- }
+ return py_update (self, args, update_primary);
+}
- return ret;
+static PyObject *
+py_update_filelist (PyObject *self, PyObject *args)
+{
+ return py_update (self, args, update_filelist);
}
static PyObject *
py_update_other (PyObject *self, PyObject *args)
{
- const char *md_filename = NULL;
- const char *checksum = NULL;
- PyObject *log = NULL;
- PyObject *progress = NULL;
- int log_id = 0;
- char *db_filename;
- PyObject *ret = NULL;
- GError *err = NULL;
-
- if (!py_parse_args (args, &md_filename, &checksum, &log, &progress))
- return NULL;
-
- if (log)
- log_id = debug_add_handler (debug_cb, log);
-
- db_filename = update_other (md_filename,
- checksum,
- progress != NULL ? progress_cb : NULL,
- progress,
- &err);
-
- if (log_id)
- debug_remove_handler (log_id);
-
- if (db_filename) {
- ret = PyString_FromString (db_filename);
- g_free (db_filename);
- } else {
- PyErr_SetString (PyExc_TypeError, err->message);
- g_error_free (err);
- }
-
- return ret;
+ return py_update (self, args, update_other);
}
static PyMethodDef SqliteMethods[] = {
Index: xml-parser.c
===================================================================
RCS file: /home/groups/yum/cvs/yum-metadata-parser/xml-parser.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xml-parser.c 24 May 2006 12:49:16 -0000 1.3
+++ xml-parser.c 24 May 2006 20:03:11 -0000 1.4
@@ -23,7 +23,6 @@
#include <libxml/tree.h>
#include "xml-parser.h"
-#include "debug.h"
#define PACKAGE_FIELD_SIZE 1024
@@ -466,7 +465,7 @@
va_start (args, msg);
tmp = g_strdup_vprintf (msg, args);
- debug (DEBUG_LEVEL_WARNING, "* SAX Warning: %s", tmp);
+ g_warning ("* SAX Warning: %s", tmp);
g_free (tmp);
va_end (args);
@@ -541,7 +540,7 @@
rc = xmlSAXUserParseFile (&primary_sax_handler, &ctx, filename);
if (ctx.current_package) {
- debug (DEBUG_LEVEL_WARNING, "Incomplete package lost");
+ g_warning ("Incomplete package lost");
package_free (ctx.current_package);
}
@@ -752,7 +751,7 @@
va_start (args, msg);
tmp = g_strdup_vprintf (msg, args);
- debug (DEBUG_LEVEL_WARNING, "* SAX Warning: %s", tmp);
+ g_warning ("* SAX Warning: %s", tmp);
g_free (tmp);
va_end (args);
@@ -826,7 +825,7 @@
rc = xmlSAXUserParseFile (&filelist_sax_handler, &ctx, filename);
if (ctx.current_package) {
- debug (DEBUG_LEVEL_WARNING, "Incomplete package lost");
+ g_warning ("Incomplete package lost");
package_free (ctx.current_package);
}
@@ -1044,7 +1043,7 @@
va_start (args, msg);
tmp = g_strdup_vprintf (msg, args);
- debug (DEBUG_LEVEL_WARNING, "* SAX Warning: %s", tmp);
+ g_warning ("* SAX Warning: %s", tmp);
g_free (tmp);
va_end (args);
@@ -1118,7 +1117,7 @@
rc = xmlSAXUserParseFile (&other_sax_handler, &ctx, filename);
if (ctx.current_package) {
- debug (DEBUG_LEVEL_WARNING, "Incomplete package lost");
+ g_warning ("Incomplete package lost");
package_free (ctx.current_package);
}
--- debug.c DELETED ---
--- debug.h DELETED ---
More information about the Yum-cvs-commits
mailing list