From af9829d2ee35686cf0f6e82c8fb04265b1f50f82 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Sat, 21 Oct 2017 12:49:34 -0400
Subject: [PATCH] Fix parsing of setup.ini

Reset "obsoletes" between packages.  Also add a debugging statement.
---
 IniDBBuilderPackage.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/IniDBBuilderPackage.cc b/IniDBBuilderPackage.cc
index 3bc7b86..4e41659 100644
--- a/IniDBBuilderPackage.cc
+++ b/IniDBBuilderPackage.cc
@@ -85,6 +85,7 @@ IniDBBuilderPackage::buildPackage (const std::string& _name)
   cbpv.spkg = PackageSpecification();
   cbpv.spkg_id = packageversion();
   cbpv.requires = NULL;
+  cbpv.obsoletes = NULL;
   cbpv.archive = packagesource();
 
   currentSpec = NULL;
@@ -157,6 +158,7 @@ IniDBBuilderPackage::buildPackageSource (const std::string& path,
   SolverPool::addPackageData cspv = cbpv;
   cspv.type = package_source;
   cspv.requires = NULL;
+  cspv.obsoletes = NULL;
 
   /* set archive path, size, mirror, hash */
   cspv.archive = packagesource();
@@ -229,6 +231,9 @@ IniDBBuilderPackage::buildBeginBuildDepends ()
 void
 IniDBBuilderPackage::buildBeginObsoletes ()
 {
+#if DEBUG
+  Log (LOG_BABBLE) << "Beginning of an obsoletes statement" << endLog;
+#endif
   currentSpec = NULL;
   obsoletesNodeList =   PackageDepends();
   currentNodeList = &obsoletesNodeList;
-- 
2.14.2