spit out a missing deps files too, useful when recalculating new world builds.

Author: danielhams

.gitignore

@@ -41,3 +41,4 @@ worldrebuilder.sh
 src/sgug-rpm-tools/sgug_minimal_computer
 leaveinstalled.txt
 removeexisting.sh
+missingdeps.txt

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ(2.65)
 AC_INIT([sgug-rpm-tools],
-        [0.1.6],
+        [0.1.7],
         [[email protected]])
 
 AC_SUBST(ACLOCAL_AMFLAGS, "-I macros")

src/sgug-rpm-tools/sgug_dep_engine.cpp

@@ -11,13 +11,15 @@
 #include <utility>
 
 #include <iostream>
+#include <sstream>
 
 using std::function;
 using std::optional;
 using std::pair;
 using std::reference_wrapper;
 using std::stack;
 using std::string;
+using std::stringstream;
 using std::unordered_map;
 using std::unordered_set;
 using std::vector;
@@ -27,7 +29,9 @@ using std::cout;
 
 namespace sgug_rpm {
 
-  static optional<uint32_t> recursive_flatten_deps( resolvedrpm & driving_pkg,
+  static optional<uint32_t> recursive_flatten_deps(
+					  vector<string> & missing_deps_out,
+					  resolvedrpm & driving_pkg,
 					  vector<resolvedrpm> & known_packages,
 					  unordered_map<string,std::reference_wrapper<resolvedrpm> > & pid_to_package,
 					  unordered_map<string,std::reference_wrapper<resolvedrpm> > & provides_to_package,
@@ -117,9 +121,9 @@ namespace sgug_rpm {
       }
 
       if( !provider_ref_opt ) {
-	cout << "Package " << pkg_name << " has missing requires: " << pkg_require <<
-	  endl;
-	//	exit(-1);
+	stringstream missing_deps_buf;
+	missing_deps_buf << "Package " << pkg_name << " has missing requires: " << pkg_require;
+	missing_deps_out.push_back(missing_deps_buf.str());
 	continue;
       }
 
@@ -137,7 +141,8 @@ namespace sgug_rpm {
       //      cout << "It is " << child_pkg.get_package().get_name() << endl;
 
       optional<uint32_t> child_sequence_no_opt =
-	recursive_flatten_deps( driving_pkg,
+	recursive_flatten_deps( missing_deps_out,
+				driving_pkg,
 				known_packages,
 				pid_to_package,
 				provides_to_package,
@@ -175,6 +180,7 @@ namespace sgug_rpm {
 
   vector<resolvedrpm> flatten_sort_packages( vector<installedrpm> & rpms_to_resolve,
 					     const function<bool (const string&)> & special_strategy,
+					     vector<string> & missing_deps_out,
 					     progress_printer & pprinter )
   {
     vector<resolvedrpm> retval;
@@ -204,7 +210,8 @@ namespace sgug_rpm {
       if( special_strategy(pkg_name) ) {
 	vector<string> pkg_resolution_stack;
 	//      cout << "do erfp on " << pkg.get_package().get_name() << endl;
-	recursive_flatten_deps( pkg,
+	recursive_flatten_deps( missing_deps_out,
+				pkg,
 				retval,
 				pid_to_package,
 				provides_to_package,
@@ -223,7 +230,8 @@ namespace sgug_rpm {
     for( resolvedrpm & pkg : retval ) {
       vector<string> pkg_resolution_stack;
       //      cout << "do erfp on " << pkg.get_package().get_name() << endl;
-      recursive_flatten_deps( pkg,
+      recursive_flatten_deps( missing_deps_out,
+			      pkg,
 			      retval,
 			      pid_to_package,
 			      provides_to_package,

src/sgug-rpm-tools/sgug_dep_engine.hpp

@@ -33,6 +33,7 @@ namespace sgug_rpm {
 
   std::vector<resolvedrpm> flatten_sort_packages( std::vector<installedrpm> & rpms_to_resolve,
 						  const std::function<bool (const std::string&)> & special_strategy,
+						  std::vector<std::string> & missing_deps_out,
 						  progress_printer & pprinter );
 }
 

src/sgug-rpm-tools/sgug_minimal_computer.cpp

@@ -220,11 +220,14 @@ int main(int argc, char**argv)
   special_packages.emplace("xz");
   special_packages.emplace("unzip");
   /*special_packages.emplace("sgugshell");*/
+  special_packages.emplace("dnf-data");
   special_packages.emplace("microdnf");
   special_packages.emplace("tdnf");
   /*special_packages.emplace("git-all");*/
   /*special_packages.emplace("sgug-getopt");*/
 
+  vector<string> missing_deps;
+
   vector<sgug_rpm::resolvedrpm> resolved_rpms =
     sgug_rpm::flatten_sort_packages( rpms_to_resolve, 
 				     [&](const string & pkg_name) -> bool {
@@ -236,6 +239,7 @@ int main(int argc, char**argv)
 					 return false;
 				       }
 				     },
+				     missing_deps,
 				     pprinter );
 
   if( verbose ) {
@@ -259,9 +263,15 @@ int main(int argc, char**argv)
     }
   }
 
-  cout << "Writing leaveinstalled.txt and removeexisting.sh results." <<
+  cout << "Writing output files..." <<
     endl;
 
+  ofstream missingdepsfile;
+  missingdepsfile.open("missingdeps.txt");
+  for( auto & md : missing_deps ) {
+    missingdepsfile << md << endl;
+  }
+
   ofstream leaveinstalledfile;
   leaveinstalledfile.open("leaveinstalled.txt");
 
@@ -308,6 +318,7 @@ int main(int argc, char**argv)
 
   removeexistingfile.close();
   leaveinstalledfile.close();
+  missingdepsfile.close();
 
   return 0;
 }