[CVS] RPM: rpm-5_4: rpm/lib/ psm.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 25-May-2011 14:51:30
Branch: rpm-5_4 Handle: 2011052512513000
Modified files: (Branch: rpm-5_4)
rpm/lib psm.c
Log:
bring back syslog patch forgotten on rpm-5_2 branch (mdvbz#63318)
Summary:
RevisionChanges Path
2.399.2.2 +22 -0 rpm/lib/psm.c
patch -p0 '@@ .'
Index: rpm/lib/psm.c
$ cvs diff -u -r2.399.2.1 -r2.399.2.2 psm.c
--- rpm/lib/psm.c 29 Dec 2010 15:02:49 - 2.399.2.1
+++ rpm/lib/psm.c 25 May 2011 12:51:30 - 2.399.2.2
@@ -3062,6 +3062,17 @@
else
rc = rpmdbAdd(rpmtsGetRdb(ts), tid, fi-h, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBADD), 0);
+#if defined(HAVE_SYSLOG_H) defined(RPM_VENDOR_MANDRIVA) /*
log-install-remove-to-syslog */
+ {
+ char *s, fmt;
+ fmt = rpmExpand(%{___NVRA}, NULL);
+ s = headerSprintf(fi-h, fmt,
+ rpmTagTable, rpmHeaderFormats, NULL);
+ syslog(LOG_NOTICE, [RPM] %s installed\n, s);
+ fmt = _free(fmt);
+ s = _free(s);
+ }
+#endif
}
if (rc != RPMRC_OK) {
@@ -3091,6 +3102,17 @@
(void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
rc = rpmdbRemove(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi-record, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
+#if defined(HAVE_SYSLOG_H) defined(RPM_VENDOR_MANDRIVA) /*
log-install-remove-to-syslog */
+{
+ char *s, fmt;
+ fmt = rpmExpand(%{___NVRA}, NULL);
+ s = headerSprintf(fi-h, fmt,
+ rpmTagTable, rpmHeaderFormats, NULL);
+ syslog(LOG_NOTICE, [RPM] %s removed\n, s);
+ fmt = _free(fmt);
+ s = _free(s);
+ }
+#endif
if (rc != RPMRC_OK) {
xx = rpmtxnAbort(rpmtsGetRdb(ts)-db_txn);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/lib/ psm.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 25-May-2011 14:52:22
Branch: rpm-5_3 Handle: 2011052512522100
Modified files: (Branch: rpm-5_3)
rpm/lib psm.c
Log:
bring back syslog patch forgotten on rpm-5_2 branch (mdvbz#63318)
Summary:
RevisionChanges Path
2.394.2.11 +22 -0 rpm/lib/psm.c
patch -p0 '@@ .'
Index: rpm/lib/psm.c
$ cvs diff -u -r2.394.2.10 -r2.394.2.11 psm.c
--- rpm/lib/psm.c 9 Apr 2011 23:02:04 - 2.394.2.10
+++ rpm/lib/psm.c 25 May 2011 12:52:21 - 2.394.2.11
@@ -3070,6 +3070,17 @@
else
rc = rpmdbAdd(rpmtsGetRdb(ts), tid, fi-h, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBADD), 0);
+#if defined(HAVE_SYSLOG_H) defined(RPM_VENDOR_MANDRIVA) /*
log-install-remove-to-syslog */
+ {
+ char *s, fmt;
+ fmt = rpmExpand(%{___NVRA}, NULL);
+ s = headerSprintf(fi-h, fmt,
+ rpmTagTable, rpmHeaderFormats, NULL);
+ syslog(LOG_NOTICE, [RPM] %s installed\n, s);
+ fmt = _free(fmt);
+ s = _free(s);
+ }
+#endif
}
if (rc != RPMRC_OK) {
@@ -3099,6 +3110,17 @@
(void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
rc = rpmdbRemove(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi-record, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
+#if defined(HAVE_SYSLOG_H) defined(RPM_VENDOR_MANDRIVA) /*
log-install-remove-to-syslog */
+{
+ char *s, fmt;
+ fmt = rpmExpand(%{___NVRA}, NULL);
+ s = headerSprintf(fi-h, fmt,
+ rpmTagTable, rpmHeaderFormats, NULL);
+ syslog(LOG_NOTICE, [RPM] %s removed\n, s);
+ fmt = _free(fmt);
+ s = _free(s);
+ }
+#endif
if (rc != RPMRC_OK) {
xx = rpmtxnAbort(rpmtsGetRdb(ts)-db_txn);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
