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: 19-Aug-2007 17:26:12
Branch: HEAD Handle: 2007081916261101
Modified files:
rpm CHANGES rpmqv.c
rpm/lib librpm.vers rpmrollback.c rpmts.h
Log:
- eliminate the rpmrbFoo, use rpmcliInstallFoo instead.
Summary:
Revision Changes Path
1.1590 +1 -0 rpm/CHANGES
1.9 +1 -3 rpm/lib/librpm.vers
1.10 +1 -33 rpm/lib/rpmrollback.c
2.66 +0 -9 rpm/lib/rpmts.h
1.126 +6 -6 rpm/rpmqv.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1589 -r1.1590 CHANGES
--- rpm/CHANGES 19 Aug 2007 13:49:24 -0000 1.1589
+++ rpm/CHANGES 19 Aug 2007 15:26:11 -0000 1.1590
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: eliminate the rpmrbFoo, use rpmcliInstallFoo instead.
- jbj: load/unload header macros for %{_sourcedir} et al expansions.
- jbj: don't open rpmdb O_RDWR iff srpm to permit non-root installs.
- jbj: prepare for open as a macro in bleeding edge glibc-2.6.90+.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/librpm.vers
============================================================================
$ cvs diff -u -r1.8 -r1.9 librpm.vers
--- rpm/lib/librpm.vers 18 Aug 2007 16:29:21 -0000 1.8
+++ rpm/lib/librpm.vers 19 Aug 2007 15:26:12 -0000 1.9
@@ -81,6 +81,7 @@
rpmcliInstallCheck;
rpmcliInstallOrder;
rpmcliInstallProblems;
+ rpmcliInstallRun;
rpmcliInstallSuggests;
rpmcliPackagesTotal;
rpmcliPipeOutput;
@@ -254,9 +255,6 @@
rpmQueryVerify;
rpmQVKArgs;
rpmQVSourcePoptTable;
- rpmrbCheck;
- rpmrbOrder;
- rpmrbRun;
rpmReadConfigFiles;
rpmReadHeader;
rpmReadPackageFile;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrollback.c
============================================================================
$ cvs diff -u -r1.9 -r1.10 rpmrollback.c
--- rpm/lib/rpmrollback.c 18 Aug 2007 16:29:21 -0000 1.9
+++ rpm/lib/rpmrollback.c 19 Aug 2007 15:26:12 -0000 1.10
@@ -372,38 +372,6 @@
return rc;
}
-static int rpmrbProblems(rpmts ts, /[EMAIL PROTECTED]@*/ const char * msg,
int rc)
- /[EMAIL PROTECTED] fileSystem @*/
- /[EMAIL PROTECTED] ts, fileSystem @*/
-{
- rpmps ps = rpmtsProblems(ts);
-
- if (rc != 0 && rpmpsNumProblems(ps) > 0) {
- if (msg)
- rpmMessage(RPMMESS_ERROR, "%s:\n", msg);
- rpmpsPrint(NULL, ps);
- }
- ps = rpmpsFree(ps);
- return rc;
-}
-
-int rpmrbCheck(rpmts ts)
-{
- return rpmrbProblems(ts, N_("Failed dependencies"), rpmtsCheck(ts));
-}
-
-int rpmrbOrder(rpmts ts)
-{
- return rpmrbProblems(ts, N_("Ordering problems"), rpmtsOrder(ts));
-}
-
-/** @todo Use rpmInstallRun instead. */
-int rpmrbRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
-{
- return rpmrbProblems(ts, N_("Rollback problems"),
- rpmtsRun(ts, okProbs, ignoreSet));
-}
-
/** @todo Transaction handling, more, needs work. */
int rpmRollback(rpmts ts, QVA_t ia, const char ** argv)
{
@@ -621,7 +589,7 @@
}
/* Print any rollback transaction problems */
- (void) rpmrbProblems(ts, N_("Missing re-packaged package(s)"), 1);
+ xx = rpmcliInstallProblems(ts, _("Missing re-packaged package(s)"), 1);
/* Anything to do? */
if (rpmcliPackagesTotal <= 0)
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.h
============================================================================
$ cvs diff -u -r2.65 -r2.66 rpmts.h
--- rpm/lib/rpmts.h 5 Aug 2007 14:02:34 -0000 2.65
+++ rpm/lib/rpmts.h 19 Aug 2007 15:26:12 -0000 2.66
@@ -292,9 +292,6 @@
int rpmtsCheck(rpmts ts)
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem,
internalState @*/
/[EMAIL PROTECTED] ts, rpmGlobalMacroContext, fileSystem, internalState
@*/;
-int rpmrbCheck(rpmts ts)
- /[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem,
internalState @*/
- /[EMAIL PROTECTED] ts, rpmGlobalMacroContext, fileSystem, internalState
@*/;
/** \ingroup rpmts
* Determine package order in a transaction set according to dependencies.
@@ -315,9 +312,6 @@
int rpmtsOrder(rpmts ts)
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem,
internalState @*/
/[EMAIL PROTECTED] ts, rpmGlobalMacroContext, fileSystem, internalState
@*/;
-int rpmrbOrder(rpmts ts)
- /[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem,
internalState @*/
- /[EMAIL PROTECTED] ts, rpmGlobalMacroContext, fileSystem, internalState
@*/;
/** \ingroup rpmts
* Process all package elements in a transaction set. Before calling
@@ -339,9 +333,6 @@
int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem,
internalState @*/
/[EMAIL PROTECTED] ts, rpmGlobalMacroContext, fileSystem, internalState
@*/;
-int rpmrbRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
- /[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem,
internalState @*/
- /[EMAIL PROTECTED] ts, rpmGlobalMacroContext, fileSystem, internalState
@*/;
/** \ingroup rpmts
* Rollback a failed transaction.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmqv.c
============================================================================
$ cvs diff -u -r1.125 -r1.126 rpmqv.c
--- rpm/rpmqv.c 18 Aug 2007 16:29:20 -0000 1.125
+++ rpm/rpmqv.c 19 Aug 2007 15:26:11 -0000 1.126
@@ -662,9 +662,9 @@
argerror(_("no packages given for erase"));
ia->transFlags |= RPMTRANS_FLAG_NOFDIGESTS;
ia->probFilter |= RPMPROB_FILTER_OLDPACKAGE;
-ia->rbCheck = rpmrbCheck;
-ia->rbOrder = rpmrbOrder;
-ia->rbRun = rpmrbRun;
+ia->rbCheck = rpmcliInstallCheck;
+ia->rbOrder = rpmcliInstallOrder;
+ia->rbRun = rpmcliInstallRun;
ec += rpmRollback(ts, ia, NULL);
} else {
ec += rpmErase(ts, ia, (const char **) poptGetArgs(optCon));
@@ -706,9 +706,9 @@
argerror(_("no packages given for install"));
ia->transFlags |= RPMTRANS_FLAG_NOFDIGESTS;
ia->probFilter |= RPMPROB_FILTER_OLDPACKAGE;
-ia->rbCheck = rpmrbCheck;
-ia->rbOrder = rpmrbOrder;
-ia->rbRun = rpmrbRun;
+ia->rbCheck = rpmcliInstallCheck;
+ia->rbOrder = rpmcliInstallOrder;
+ia->rbRun = rpmcliInstallRun;
/[EMAIL PROTECTED]@*/ ec += rpmRollback(ts, ia, NULL);
} else {
/[EMAIL PROTECTED] [EMAIL PROTECTED]/ /* FIX:
ia->relocations[0].newPath undefined */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
