fix: removed files fingerprint memory leak.

fix: resurrect allfiles flag from rpm-2.5.x.

CVS patchset: 3312
CVS date: 1999/09/21 17:21:57

1 files changed, 10 insertions, 9 deletions

diff --git a/rpm.c b/rpm.c
index c84f4d4e3..1c6959bee 100755
--- a/rpm.c
+++ b/rpm.c
@@ -1268,24 +1268,25 @@ int main(int argc, char ** argv)
 	if (ignoreOs) probFilter |= RPMPROB_FILTER_IGNOREOS;
 	if (ignoreSize) probFilter |= RPMPROB_FILTER_DISKSPACE;
 
-	if (allFiles) installFlags |= RPMTRANS_FLAG_ALLFILES;
-	if (justdb) installFlags |= RPMTRANS_FLAG_JUSTDB;
 	if (test) installFlags |= RPMTRANS_FLAG_TEST;
+	/* RPMTRANS_FLAG_BUILD_PROBS */
 	if (noScripts) installFlags |= RPMTRANS_FLAG_NOSCRIPTS;
+	if (justdb) installFlags |= RPMTRANS_FLAG_JUSTDB;
 	if (noTriggers) installFlags |= RPMTRANS_FLAG_NOTRIGGERS;
-
-	if (showPercents) interfaceFlags |= INSTALL_PERCENT;
-	if (showHash) interfaceFlags |= INSTALL_HASH;
-	if (noDeps) interfaceFlags |= INSTALL_NODEPS;
-	if (noOrder) interfaceFlags |= INSTALL_NOORDER;
-	if (upgrade) interfaceFlags |= INSTALL_UPGRADE;
-
 	if (!incldocs) {
 	    if (excldocs)
 		installFlags |= RPMTRANS_FLAG_NODOCS;
 	    else if (rpmExpandNumeric("%{_excludedocs}"))
 		installFlags |= RPMTRANS_FLAG_NODOCS;
 	}
+	if (allFiles) installFlags |= RPMTRANS_FLAG_ALLFILES;
+	/* RPMTRANS_FLAG_KEEPOBSOLETE */
+
+	if (showPercents) interfaceFlags |= INSTALL_PERCENT;
+	if (showHash) interfaceFlags |= INSTALL_HASH;
+	if (noDeps) interfaceFlags |= INSTALL_NODEPS;
+	if (noOrder) interfaceFlags |= INSTALL_NOORDER;
+	if (upgrade) interfaceFlags |= INSTALL_UPGRADE;
 
 	if (!poptPeekArg(optCon))
 	    argerror(_("no packages given for install"));