Source loading

yast · Feb 4, 2020 · 20d3e44 · 20d3e44
1 parent bc936b1
commit 20d3e44
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/src/PkgFunctions.cc b/src/PkgFunctions.cc
@@ -61,6 +61,7 @@ const zypp::ResStatus::TransactByValue PkgFunctions::whoWantsIt = zypp::ResStatu
 PkgFunctions::PkgFunctions () :
       _target_root( "/" )
     , _target_loaded(false)
+    , _source_loaded(false)
     , zypp_pointer(NULL)
     , repo_manager(NULL)
     , autorefresh_skipped(false)

diff --git a/src/PkgFunctions.h b/src/PkgFunctions.h
@@ -83,6 +83,7 @@ class PkgFunctions
 
 	zypp::Pathname _target_root;
 	bool _target_loaded;
+	bool _source_loaded;
 
 	zypp::ZYpp::Ptr zypp_pointer;
 

diff --git a/src/Source_Load.cc b/src/Source_Load.cc
@@ -55,9 +55,9 @@ PkgFunctions::SourceRestore()
     // return value
     bool success = true;
 
-    if (repos.size() > 0)
+    if (_source_loaded)
     {
-	y2warning("Number of registered repositories: %zd, skipping repository load!", repos.size());
+	y2warning("Repositories already loaded, skipping repository load!");
 	return YCPBoolean(success);
     }
 
@@ -112,6 +112,7 @@ PkgFunctions::SourceRestore()
 			}
 		    }
 		}
+				_source_loaded = true;
 	    }
 	    catch (const zypp::Exception& excpt)
 	    {

diff --git a/src/Source_Save.cc b/src/Source_Save.cc
@@ -293,6 +293,8 @@ PkgFunctions::SourceFinishAll ()
     }
 
     y2milestone("All sources and services have been unregistered");
+		// reset the source loaded flag
+		_source_loaded = false;
 
     return YCPBoolean(true);
 }