Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=8f011090bd4ce86d9fff379db739568e84df121d
commit 8f011090bd4ce86d9fff379db739568e84df121d
Author: Michel Hermier <herm...@frugalware.org>
Date: Tue Nov 5 12:41:20 2013 +0100
libpacman: Move logging of transcation success from frontend to backend.
diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c
index 779ba0f..8ba3b18 100644
--- a/lib/libpacman/trans.c
+++ b/lib/libpacman/trans.c
@@ -171,9 +171,36 @@ int _pacman_trans_addtarget(pmtrans_t *trans, const char
*target)
void _pacman_trans_event(pmtrans_t *trans, unsigned char event, void *data1,
void *data2)
{
+ char str[LOG_STR_LEN] = "";
+
/* Sanity checks */
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+ switch(event) {
+ case PM_TRANS_EVT_ADD_DONE:
+ snprintf(str, LOG_STR_LEN, "installed %s (%s)",
+ (char *)pacman_pkg_getinfo(data1, PM_PKG_NAME),
+ (char *)pacman_pkg_getinfo(data1, PM_PKG_VERSION));
+ pacman_logaction(str);
+ break;
+ case PM_TRANS_EVT_REMOVE_DONE:
+ snprintf(str, LOG_STR_LEN, "removed %s (%s)",
+ (char *)pacman_pkg_getinfo(data1, PM_PKG_NAME),
+ (char *)pacman_pkg_getinfo(data1, PM_PKG_VERSION));
+ pacman_logaction(str);
+ break;
+ case PM_TRANS_EVT_UPGRADE_DONE:
+ snprintf(str, LOG_STR_LEN, "upgraded %s (%s -> %s)",
+ (char *)pacman_pkg_getinfo(data1, PM_PKG_NAME),
+ (char *)pacman_pkg_getinfo(data2, PM_PKG_VERSION),
+ (char *)pacman_pkg_getinfo(data1, PM_PKG_VERSION));
+ pacman_logaction(str);
+ break;
+ default:
+ /* Nothing to log */
+ break;
+ }
+
if(trans->cbs.event) {
trans->cbs.event(event, data1, data2);
}
diff --git a/src/pacman-g2/trans.c b/src/pacman-g2/trans.c
index 437c921..eb1b63c 100644
--- a/src/pacman-g2/trans.c
+++ b/src/pacman-g2/trans.c
@@ -96,10 +96,6 @@ void cb_trans_evt(unsigned char event, void *data1, void
*data2)
if(config->noprogressbar) {
MSG(CL, _("done.\n"));
}
- snprintf(str, LOG_STR_LEN, "installed %s (%s)",
- (char *)pacman_pkg_getinfo(data1, PM_PKG_NAME),
- (char *)pacman_pkg_getinfo(data1,
PM_PKG_VERSION));
- pacman_logaction(str);
break;
case PM_TRANS_EVT_REMOVE_START:
if(config->noprogressbar) {
@@ -112,10 +108,6 @@ void cb_trans_evt(unsigned char event, void *data1, void
*data2)
} else {
MSG(NL, "");
}
- snprintf(str, LOG_STR_LEN, "removed %s (%s)",
- (char *)pacman_pkg_getinfo(data1, PM_PKG_NAME),
- (char *)pacman_pkg_getinfo(data1,
PM_PKG_VERSION));
- pacman_logaction(str);
break;
case PM_TRANS_EVT_UPGRADE_START:
if(config->noprogressbar) {
@@ -126,11 +118,6 @@ void cb_trans_evt(unsigned char event, void *data1, void
*data2)
if(config->noprogressbar) {
MSG(CL, _("done.\n"));
}
- snprintf(str, LOG_STR_LEN, "upgraded %s (%s -> %s)",
- (char *)pacman_pkg_getinfo(data1, PM_PKG_NAME),
- (char *)pacman_pkg_getinfo(data2,
PM_PKG_VERSION),
- (char *)pacman_pkg_getinfo(data1,
PM_PKG_VERSION));
- pacman_logaction(str);
break;
case PM_TRANS_EVT_INTEGRITY_START:
MSG(NL, _("checking package integrity... "));
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
