RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 21-Dec-2008 00:14:52 Branch: HEAD Handle: 2008122023145100 Modified files: rpm CHANGES rpm/lib filetriggers.c transaction.c Log: - bury MDV file triggers under RPM_VENDOR_MANDRIVA. Summary: Revision Changes Path 1.2697 +1 -0 rpm/CHANGES 2.13 +2 -0 rpm/lib/filetriggers.c 1.391 +12 -2 rpm/lib/transaction.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2696 -r1.2697 CHANGES --- rpm/CHANGES 20 Dec 2008 22:56:33 -0000 1.2696 +++ rpm/CHANGES 20 Dec 2008 23:14:51 -0000 1.2697 @@ -1,5 +1,6 @@ 5.2a2 -> 5.2a3: + - jbj: bury MDV file triggers under RPM_VENDOR_MANDRIVA. - jbj: use poptSaneFile() when available (popt-1.15). - jbj: use poptReadConfigFiles() when available (popt-1.15). - provyind: python: build with -fno-strict-aliasing. @@ . patch -p0 <<'@@ .' Index: rpm/lib/filetriggers.c ============================================================================ $ cvs diff -u -r2.12 -r2.13 filetriggers.c --- rpm/lib/filetriggers.c 20 Dec 2008 00:51:46 -0000 2.12 +++ rpm/lib/filetriggers.c 20 Dec 2008 23:14:51 -0000 2.13 @@ -1,3 +1,4 @@ +#if defined(RPM_VENDOR_MANDRIVA) #include "system.h" #include <rpmio_internal.h> /* XXX for fdGetFILE() */ @@ -377,3 +378,4 @@ xx = unlink(fn); fn = _free(fn); } +#endif /* defined(RPM_VENDOR_MANDRIVA) */ @@ . patch -p0 <<'@@ .' Index: rpm/lib/transaction.c ============================================================================ $ cvs diff -u -r1.390 -r1.391 transaction.c --- rpm/lib/transaction.c 10 Dec 2008 23:08:27 -0000 1.390 +++ rpm/lib/transaction.c 20 Dec 2008 23:14:51 -0000 1.391 @@ -36,7 +36,9 @@ #include "misc.h" /* XXX (free)splitString, currentDirectory */ +#if defined(RPM_VENDOR_MANDRIVA) #include "filetriggers.h" /* XXX mayAddToFilesAwaitingFiletriggers, rpmRunFileTriggers */ +#endif #include <rpmcli.h> /* XXX QVA_t INSTALL_FOO flags */ #include <rpmrollback.h> /* IDTX prototypes */ @@ -1824,11 +1826,14 @@ if ((xx = rpmpsmStage(psm, PSM_PKGINSTALL)) != 0) { ourrc++; xx = markLinkedFailed(ts, p); - } else { + } +#if defined(RPM_VENDOR_MANDRIVA) + else { if(!rpmteIsSource(fi->te)) xx = mayAddToFilesAwaitingFiletriggers(rpmtsRootDir(ts), psm->fi, 1); p->done = 1; } +#endif } else { ourrc++; @@ -1853,11 +1858,14 @@ if (p->linkFailed == 0) { if ((xx = rpmpsmStage(psm, PSM_PKGERASE)) != 0) { ourrc++; - } else { + } +#if defined(RPM_VENDOR_MANDRIVA) + else { if(!rpmteIsSource(fi->te)) xx = mayAddToFilesAwaitingFiletriggers(rpmtsRootDir(ts), psm->fi, 0); p->done = 1; } +#endif } else ourrc++; @@ -1893,8 +1901,10 @@ !(rpmtsFlags(ts) & RPMTRANS_FLAG_TEST)) { +#if defined(RPM_VENDOR_MANDRIVA) if ((rpmtsFlags(ts) & _noTransTriggers) != _noTransTriggers) rpmRunFileTriggers(rpmtsRootDir(ts)); +#endif rpmlog(RPMLOG_DEBUG, D_("running post-transaction scripts\n")); pi = rpmtsiInit(ts); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
