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-Feb-2010 18:17:37 Branch: HEAD Handle: 2010022117173601 Modified files: rpm CHANGES rpm/lib depends.c librpm.vers rpmts.h transaction.c Log: - rpmts: add pluggable check/order/run method vectors. Summary: Revision Changes Path 1.3272 +1 -0 rpm/CHANGES 1.459 +8 -2 rpm/lib/depends.c 1.75 +3 -0 rpm/lib/librpm.vers 2.129 +12 -3 rpm/lib/rpmts.h 1.428 +4 -1 rpm/lib/transaction.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3271 -r1.3272 CHANGES --- rpm/CHANGES 21 Feb 2010 17:11:09 -0000 1.3271 +++ rpm/CHANGES 21 Feb 2010 17:17:36 -0000 1.3272 @@ -1,5 +1,6 @@ 5.2b1 -> 5.3a1 + - jbj: rpmts: add pluggable check/order/run method vectors. - jbj: hkp: add keys.rpm5.org as the default pubkey server. - jbj: fix: split NV iff V starts with digit string in lookupPackage(). - jbj: fix: remove the inheirited %description before adding explicitly. @@ . patch -p0 <<'@@ .' Index: rpm/lib/depends.c ============================================================================ $ cvs diff -u -r1.458 -r1.459 depends.c --- rpm/lib/depends.c 28 Jan 2010 05:50:29 -0000 1.458 +++ rpm/lib/depends.c 21 Feb 2010 17:17:37 -0000 1.459 @@ -2319,7 +2319,7 @@ return nslashes; } -int rpmtsOrder(rpmts ts) +int _rpmtsOrder(rpmts ts) { rpmds requires; rpmuint32_t Flags; @@ -2826,7 +2826,10 @@ return 0; } -int rpmtsCheck(rpmts ts) +int (*rpmtsOrder) (rpmts ts) + = _rpmtsOrder; + +int _rpmtsCheck(rpmts ts) { const char * depName = NULL; rpmdepFlags depFlags = rpmtsDFlags(ts); @@ -3014,3 +3017,6 @@ return ourrc; } + +int (*rpmtsCheck) (rpmts ts) + = _rpmtsCheck; @@ . patch -p0 <<'@@ .' Index: rpm/lib/librpm.vers ============================================================================ $ cvs diff -u -r1.74 -r1.75 librpm.vers --- rpm/lib/librpm.vers 10 Feb 2010 18:33:36 -0000 1.74 +++ rpm/lib/librpm.vers 21 Feb 2010 17:17:37 -0000 1.75 @@ -326,6 +326,7 @@ rpmtsAddEraseElement; rpmtsAddInstallElement; rpmtsAvailable; + _rpmtsCheck; rpmtsCheck; rpmtsCheckDSIProblems; rpmtsChrootDone; @@ -357,6 +358,7 @@ rpmtsOp; rpmtsOpenDB; rpmtsOpenSDB; + _rpmtsOrder; rpmtsOrder; rpmtsPRCO; rpmtsPrefColor; @@ -364,6 +366,7 @@ rpmtsRebuildDB; rpmtsRelocateElement; rpmtsRootDir; + _rpmtsRun; rpmtsRun; rpmtsScriptFd; rpmtsSELinuxEnabled; @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmts.h ============================================================================ $ cvs diff -u -r2.128 -r2.129 rpmts.h --- rpm/lib/rpmts.h 25 Dec 2009 13:58:56 -0000 2.128 +++ rpm/lib/rpmts.h 21 Feb 2010 17:17:37 -0000 2.129 @@ -343,7 +343,10 @@ * @param ts transaction set * @return 0 = deps ok, 1 = dep problems, 2 = error */ -int rpmtsCheck(rpmts ts) +int _rpmtsCheck(rpmts ts) + /*...@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ + /*...@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/; +extern int (*rpmtsCheck) (rpmts ts) /*...@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ /*...@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/; @@ -363,7 +366,10 @@ * @param ts transaction set * @return no. of (added) packages that could not be ordered */ -int rpmtsOrder(rpmts ts) +int _rpmtsOrder(rpmts ts) + /*...@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ + /*...@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/; +extern int (*rpmtsOrder) (rpmts ts) /*...@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ /*...@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/; @@ -384,7 +390,10 @@ * @param ignoreSet bits to filter problem types * @return 0 on success, -1 on error, >0 with newProbs set */ -int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet) +int _rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet) + /*...@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ + /*...@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/; +extern int (*rpmtsRun) (rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet) /*...@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ /*...@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/; @@ . patch -p0 <<'@@ .' Index: rpm/lib/transaction.c ============================================================================ $ cvs diff -u -r1.427 -r1.428 transaction.c --- rpm/lib/transaction.c 12 Feb 2010 12:32:08 -0000 1.427 +++ rpm/lib/transaction.c 21 Feb 2010 17:17:37 -0000 1.428 @@ -2029,7 +2029,7 @@ } /*...@=nullpass@*/ -int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet) +int _rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet) { int ourrc = -1; /* assume failure */ uint32_t totalFileCount = 0; @@ -2169,3 +2169,6 @@ } /*...@=nullstate@*/ } + +int (*rpmtsRun) (rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet) + = _rpmtsRun; @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
