From 6abf077d7096e2f48bf1316e37ee6651c78b536e Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 30 Oct 2007 15:15:19 +0200 Subject: No callback, no repackaging info - tough... --- lib/psm.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/psm.c b/lib/psm.c index c811de8ef..78e61e7e8 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -1776,13 +1776,6 @@ assert(psm->mi == NULL); errno = saveerrno; } - if (psm->goal == PSM_PKGSAVE) { - if (!rc && ts && ts->notify == NULL) { - rpmlog(RPMLOG_INFO, _("Wrote: %s\n"), - (psm->pkgURL ? psm->pkgURL : "???")); - } - } - if (rc) { if (psm->failedFile) rpmlog(RPMERR_CPIO, -- cgit v1.2.3 From 41cd82aa7c6a0b9115d776a387b3177664075d44 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 30 Oct 2007 15:50:35 +0200 Subject: Split transaction score stuff to separate private header --- lib/Makefile.am | 2 +- lib/psm.c | 2 +- lib/rpmts.c | 1 + lib/rpmts.h | 80 +------------------------------------------------------- lib/rpmtsscore.h | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 78 insertions(+), 81 deletions(-) create mode 100644 lib/rpmtsscore.h diff --git a/lib/Makefile.am b/lib/Makefile.am index 1f0ac6bd5..e178c5708 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -24,7 +24,7 @@ librpm_la_SOURCES = \ idtx.c manifest.c manifest.h misc.c package.c \ poptALL.c poptI.c poptQV.c psm.c psm.h query.c \ rpmal.c rpmchecksig.c rpmds.c rpmfi.c rpmgi.c rpmgi_internal.h \ - rpminstall.c \ + rpminstall.c rpmtsscore.h \ rpmlead.c rpmlead.h rpmlibprov.c rpmps.c rpmrc.c rpmte.c rpmts.c \ rpmvercmp.c signature.c signature.h stringbuf.c transaction.c \ verify.c rpmlock.c rpmlock.h misc.h diff --git a/lib/psm.c b/lib/psm.c index 78e61e7e8..6fba8d934 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -23,7 +23,7 @@ #define _RPMTE_INTERNAL #include "rpmte.h" -#define _RPMTS_INTERNAL /* XXX ts->notify */ +#include "rpmtsscore.h" #include "rpmts.h" #include "rpmlead.h" /* writeLead proto */ diff --git a/lib/rpmts.c b/lib/rpmts.c index df6c47175..79e87afc9 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -20,6 +20,7 @@ #define _RPMTS_INTERNAL #include "rpmts.h" +#include "rpmtsscore.h" /* XXX FIXME: merge with existing (broken?) tests in system.h */ /* portability fiddles */ diff --git a/lib/rpmts.h b/lib/rpmts.h index ee6f660a9..bd8621084 100644 --- a/lib/rpmts.h +++ b/lib/rpmts.h @@ -99,85 +99,7 @@ typedef enum rpmtsOpX_e { #include "rpmhash.h" /* XXX hashTable */ #include "rpmal.h" /* XXX availablePackage/relocateFileList ,*/ -#include "rpmte.h" /* for rpmElementType */ - -/********************** - * Transaction Scores * - ********************** - * - * In order to allow instance counts to be adjusted properly when an - * autorollback transaction is ran, we keep a list that is indexed - * by rpm name of whether the rpm has been installed or erased. This listed - * is only updated: - * - * iif autorollbacks are enabled. - * iif this is not a rollback or autorollback transaction. - * - * When creating an autorollback transaction, its rpmts points to the same - * rpmtsScore object as the running transaction. So when the autorollback - * transaction runs it can see where each package was in the running transaction - * at the point the running transaction failed, and thus on a per package - * basis make adjustments to the instance counts. - * - * XXX: Jeff, I am not convinced that this does not need to be in its own file - * (i.e. rpmtsScore.{h,c}), but I first wanted to get it working. - */ -struct rpmtsScoreEntry_s { - char * N; /*! Date: Tue, 30 Oct 2007 15:53:44 +0200 Subject: Erm... rpmdsFlags are int32_t type, not char* --- build/rpmfc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/rpmfc.c b/build/rpmfc.c index 14bc1e44c..ec6baff4c 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -1662,7 +1662,7 @@ assert(ac == c); if (fc->provides != NULL && (c = rpmdsCount(fc->provides)) > 0 && !fc->skipProv) { const char **names = xcalloc(c, sizeof(char *)); const char **evrs = xcalloc(c, sizeof(char *)); - const char **flags = xcalloc(c, sizeof(int_32 *)); + int32_t *flags = xcalloc(c, sizeof(int32_t *)); int i; rpmds pi = rpmdsInit(fc->provides); while ((i = rpmdsNext(pi)) >= 0) { @@ -1696,7 +1696,7 @@ assert(flags != NULL); if (fc->requires != NULL && (c = rpmdsCount(fc->requires)) > 0 && !fc->skipReq) { const char **names = xcalloc(c, sizeof(char *)); const char **evrs = xcalloc(c, sizeof(char *)); - const char **flags = xcalloc(c, sizeof(int_32 *)); + int32_t *flags = xcalloc(c, sizeof(int32_t *)); int i; rpmds ri = rpmdsInit(fc->requires); while ((i = rpmdsNext(ri)) >= 0) { -- cgit v1.2.3