From fd6ce1f4cb8011756f7c07d28c5e06ce0be1acb7 Mon Sep 17 00:00:00 2001 From: Aurelien Foret Date: Mon, 9 Jan 2006 20:16:00 +0000 Subject: - merged pkg_new and pkg_dummy functions - renamed _alpm_log_action to _alpm_logaction --- lib/libalpm/alpm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/libalpm/alpm.c') diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 610c3f64..fed105e2 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -565,9 +565,12 @@ int alpm_trans_init(unsigned char type, unsigned char flags, alpm_trans_cb_event { /* Sanity checks */ ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); - ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1)); + /* ORE + * perform sanity checks on type and flags: + * for instance, we can't set UPGRADE and FRESHEN at the same time */ + handle->trans = trans_new(); if(handle->trans == NULL) { RET_ERR(PM_ERR_MEMORY, -1); @@ -708,7 +711,7 @@ int alpm_logaction(char *fmt, ...) It allows to share the log file between several frontends and to actually know who does what */ - return(_alpm_log_action(handle->usesyslog, handle->logfd, str)); + return(_alpm_logaction(handle->usesyslog, handle->logfd, str)); } /** @} */ -- cgit v1.2.3-24-g4f1b