This is the mail archive of the cygwin-apps mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH setup 2/3] Internalize the libsolv repo attribute data after each setup.ini


Call SolverPool::internalize() in the IniDBBuilderPackage destructor.
This makes attribute data from all previously processed setup.ini
files available when the next setup.ini is being processed.

Remove the now unneeded call to SolverPool::internalize() at the
beginning of packagedb::read().
---
 IniDBBuilderPackage.cc | 2 ++
 package_db.cc          | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IniDBBuilderPackage.cc b/IniDBBuilderPackage.cc
index d560cb7..324f1bf 100644
--- a/IniDBBuilderPackage.cc
+++ b/IniDBBuilderPackage.cc
@@ -37,6 +37,8 @@ currentSpec (0), _feedback (aFeedback){}
 IniDBBuilderPackage::~IniDBBuilderPackage()
 {
   process();
+  packagedb db;
+  db.solver.internalize();
 }
 
 void
diff --git a/package_db.cc b/package_db.cc
index 072b419..d12e841 100644
--- a/package_db.cc
+++ b/package_db.cc
@@ -71,8 +71,6 @@ packagedb::read ()
 {
   if (!installeddbread)
     {
-      solver.internalize();
-
       /* Read in the local installation database. */
       io_stream *db = 0;
       db = io_stream::open ("cygfile:///etc/setup/installed.db", "rt", 0);
-- 
2.16.2


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]