diff options
| author | Aurelien Foret <aurelien@archlinux.org> | 2006-01-09 21:16:00 +0100 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2006-01-09 21:16:00 +0100 |
| commit | fd6ce1f4cb8011756f7c07d28c5e06ce0be1acb7 (patch) | |
| tree | 1e735f251fdfb3413085862bf77f851ec0ce3eb0 /lib/libalpm/alpm.c | |
| parent | 45a7e57f6c4c375d6b8716e2dfc15da592ec147b (diff) | |
| download | pacman-fd6ce1f4cb8011756f7c07d28c5e06ce0be1acb7.tar.gz pacman-fd6ce1f4cb8011756f7c07d28c5e06ce0be1acb7.tar.xz | |
- merged pkg_new and pkg_dummy functions
- renamed _alpm_log_action to _alpm_logaction
Diffstat (limited to 'lib/libalpm/alpm.c')
| -rw-r--r-- | lib/libalpm/alpm.c | 7 |
1 files changed, 5 insertions, 2 deletions
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)); } /** @} */ |