From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 26 Feb 2009 14:38:10 +0000 (+0200)
Subject: Honor --nomanifest on install too
X-Git-Tag: rpm-4.7.0-beta1~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e6c5e890460224f455c0ef9e516ea675b00208d;p=platform%2Fupstream%2Frpm.git

Honor --nomanifest on install too
- bit of a kludge but works.. and fixes test case 39
---

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 1ebba67..9fb4767 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -12,6 +12,7 @@
 #include <rpm/rpmts.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>
+#include <rpm/rpmgi.h>
 
 #include "lib/manifest.h"
 #include "debug.h"
@@ -467,6 +468,10 @@ restart:
 	xx = Fclose(eiu->fd);
 	eiu->fd = NULL;
 
+	/* Honor --nomanifest */
+	if (eiu->rpmrc == RPMRC_NOTFOUND && (giFlags & RPMGI_NOMANIFEST))
+	    eiu->rpmrc = RPMRC_FAIL;
+
 	switch (eiu->rpmrc) {
 	case RPMRC_FAIL:
 	    rpmlog(RPMLOG_ERR, _("%s cannot be installed\n"), *eiu->fnp);