Rip out unused anaconda-related hacks

6 files changed, 2 insertions, 36 deletions

diff --git a/lib/depends.c b/lib/depends.c
index 3cbeed91f..a15df518b 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -758,8 +758,7 @@ static int ignoreDep(const rpmts ts, const rpmte p, const rpmte q)
     if (!badDepsInitialized) {
 	char * s = rpmExpand("%{?_dependency_whiteout}", NULL);
 	const char ** av = NULL;
-	int anaconda = rpmtsFlags(ts) & RPMTRANS_FLAG_ANACONDA;
-	int msglvl = (anaconda || (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS))
+	int msglvl = (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS)
 			? RPMMESS_WARNING : RPMMESS_DEBUG;
 	int ac = 0;
 	int i;
@@ -1049,7 +1048,6 @@ int rpmtsOrder(rpmts ts)
 {
     rpmds requires;
     int_32 Flags;
-    int anaconda = rpmtsFlags(ts) & RPMTRANS_FLAG_ANACONDA;
     uint_32 prefcolor = rpmtsPrefColor(ts);
     rpmtsi pi; rpmte p;
     rpmtsi qi; rpmte q;
@@ -1205,11 +1203,6 @@ rescan:
     qlen = 0;
     pi = rpmtsiInit(ts);
     while ((p = rpmtsiNext(pi, oType)) != NULL) {
-
-	/* Prefer packages in chainsaw or anaconda presentation order. */
-	if (anaconda)
-	    rpmteTSI(p)->tsi_qcnt = (ts->orderCount - rpmtsiOc(pi));
-
 	if (rpmteTSI(p)->tsi_count != 0)
 	    continue;
 	rpmteTSI(p)->tsi_suc = NULL;
@@ -1358,7 +1351,7 @@ rescan:
 	    while ((p = q) != NULL && (q = rpmteTSI(p)->tsi_chain) != NULL) {
 		const char * dp;
 		char buf[4096];
-		int msglvl = (anaconda || (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS))
+		int msglvl = (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS)
 			? RPMMESS_WARNING : RPMMESS_DEBUG;
 ;
 
@@ -1462,18 +1455,6 @@ rescan:
 
 	newOrder[newOrderCount++] = q;
 	ts->order[j] = NULL;
-	if (anaconda)
-	for (j = needle->orIndex + 1; j < ts->orderCount; j++) {
-	    if ((q = ts->order[j]) == NULL)
-		break;
-	    if (rpmteType(q) == TR_REMOVED
-	     && rpmteDependsOnKey(q) == needle->pkgKey)
-	    {
-		newOrder[newOrderCount++] = q;
-		ts->order[j] = NULL;
-	    } else
-		break;
-	}
     }
 
     for (j = 0; j < ts->orderCount; j++) {
diff --git a/lib/poptI.c b/lib/poptI.c
index 16dc7a640..0a8d16ce5 100644
--- a/lib/poptI.c
+++ b/lib/poptI.c
@@ -151,10 +151,6 @@ struct poptOption rpmInstallPoptTable[] = {
 	N_("remove all packages which match <package> (normally an error is generated if <package> specified multiple packages)"),
 	NULL},
 
- { "anaconda", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- 	&rpmIArgs.transFlags, RPMTRANS_FLAG_ANACONDA|RPMTRANS_FLAG_DEPLOOPS,
-	N_("use anaconda \"presentation order\""), NULL},
-
  { "apply", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.transFlags,
 	(_noTransScripts|_noTransTriggers|
 		RPMTRANS_FLAG_APPLYONLY|RPMTRANS_FLAG_PKGCOMMIT),
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index f4c470d40..c4a4b3000 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -902,7 +902,6 @@ typedef enum rpmtransFlags_e {
     RPMTRANS_FLAG_NOPAYLOAD	= (1 << 24),
     RPMTRANS_FLAG_APPLYONLY	= (1 << 25),
 
-    RPMTRANS_FLAG_ANACONDA	= (1 << 26),	/*!< from --anaconda */
     RPMTRANS_FLAG_NOMD5		= (1 << 27),	/*!< from --nomd5 */
     RPMTRANS_FLAG_NOSUGGEST	= (1 << 28),	/*!< from --nosuggest */
     RPMTRANS_FLAG_ADDINDEPS	= (1 << 29),	/*!< from --aid */
diff --git a/lib/tgi.c b/lib/tgi.c
index a963525f8..affcca777 100644
--- a/lib/tgi.c
+++ b/lib/tgi.c
@@ -50,10 +50,6 @@ static struct poptOption optionsTable[] = {
  { "key", '\0', POPT_ARG_STRING|POPT_ARGFLAG_SHOW_DEFAULT, &gikeystr, 0,
 	N_("tag value key"), NULL },
 
- { "anaconda", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- 	&transFlags, RPMTRANS_FLAG_ANACONDA|RPMTRANS_FLAG_DEPLOOPS,
-	N_("use anaconda \"presentation order\""), NULL},
-
  { "transaction", 'T', POPT_BIT_SET, &giFlags, (RPMGI_TSADD|RPMGI_TSORDER),
 	N_("create transaction set"), NULL},
  { "noorder", '\0', POPT_BIT_CLR, &giFlags, RPMGI_TSORDER,
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 5f8822e5b..3780c6749 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -446,7 +446,6 @@ void init_rpm(void)
     REGISTER_ENUM(RPMTRANS_FLAG_NOPREUN);
     REGISTER_ENUM(RPMTRANS_FLAG_NOPOSTUN);
     REGISTER_ENUM(RPMTRANS_FLAG_NOTRIGGERPOSTUN);
-    REGISTER_ENUM(RPMTRANS_FLAG_ANACONDA);
     REGISTER_ENUM(RPMTRANS_FLAG_NOMD5);
     REGISTER_ENUM(RPMTRANS_FLAG_NOSUGGEST);
     REGISTER_ENUM(RPMTRANS_FLAG_ADDINDEPS);
diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c
index 4230550e7..5b2bd7c13 100644
--- a/tools/rpmgraph.c
+++ b/tools/rpmgraph.c
@@ -262,11 +262,6 @@ static struct poptOption optionsTable[] = {
 	N_("don't verify package dependencies"), NULL },
  { "nolegacy", '\0', POPT_BIT_SET,	&vsflags, RPMVSF_NEEDPAYLOAD,
         N_("don't verify header+payload signature"), NULL },
-
- { "anaconda", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
-	&rpmIArgs.transFlags, RPMTRANS_FLAG_ANACONDA,
-	N_("use anaconda \"presentation order\""), NULL},
-
  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0,
 	N_("Common options for all rpm modes and executables:"),
 	NULL },