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: 01-Feb-2011 14:54:08
Branch: rpm-5_3 Handle: 2011020113540800
Modified files: (Branch: rpm-5_3)
rpm/lib transaction.c
Log:
don't try adding files awaiting file triggers when --test is used
Summary:
Revision Changes Path
1.428.2.5 +1 -1 rpm/lib/transaction.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.428.2.4 -r1.428.2.5 transaction.c
--- rpm/lib/transaction.c 28 Dec 2010 15:35:11 -0000 1.428.2.4
+++ rpm/lib/transaction.c 1 Feb 2011 13:54:08 -0000 1.428.2.5
@@ -1754,7 +1754,7 @@
}
#if defined(RPM_VENDOR_MANDRIVA)
- if (!failed) {
+ if (!failed && !(rpmtsFlags(ts) & RPMTRANS_FLAG_TEST)) {
if(!rpmteIsSource(p))
xx = mayAddToFilesAwaitingFiletriggers(rpmtsRootDir(ts),
fi, (rpmteType(p) == TR_ADDED ? 1 : 0));
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
