# HG changeset patch
# User wenzelm
# Date 1674921101 -3600
# Node ID be90af1e3254ecd0909928e61e82d304cb53c936
# Parent  a2ae6baa82195419acf8f19784531bcabb87d435
proper use of current ISABELLE_COMPONENT_REPOSITORY from the managing Isabelle system (amending 3e963d68d394);

diff -r a2ae6baa8219 -r be90af1e3254 src/Pure/Admin/build_history.scala
--- a/src/Pure/Admin/build_history.scala	Sat Jan 28 16:26:58 2023 +0100
+++ b/src/Pure/Admin/build_history.scala	Sat Jan 28 16:51:41 2023 +0100
@@ -186,11 +186,11 @@
 
       val component_settings =
         other_isabelle.init_components(
-          component_repository = component_repository,
           components_base = components_base,
           catalogs = Components.optional_catalogs)
       other_isabelle.init_settings(component_settings ::: init_settings)
-      other_isabelle.resolve_components(echo = verbose)
+      other_isabelle.resolve_components(
+        echo = verbose, component_repository = component_repository)
       val ml_platform =
         augment_settings(other_isabelle, threads, arch_64, heap, max_heap, more_settings)
 
@@ -203,7 +203,8 @@
       val isabelle_base_log = isabelle_output + Path.explode("../base_log")
 
       if (first_build) {
-        other_isabelle.resolve_components(echo = verbose)
+        other_isabelle.resolve_components(
+          echo = verbose, component_repository = component_repository)
         other_isabelle.scala_build(fresh = fresh, echo = verbose)
 
         for {
diff -r a2ae6baa8219 -r be90af1e3254 src/Pure/Admin/other_isabelle.scala
--- a/src/Pure/Admin/other_isabelle.scala	Sat Jan 28 16:26:58 2023 +0100
+++ b/src/Pure/Admin/other_isabelle.scala	Sat Jan 28 16:51:41 2023 +0100
@@ -75,14 +75,12 @@
   /* components */
 
   def init_components(
-    component_repository: String = Components.default_component_repository,
     components_base: String = Components.standard_components_base,
     catalogs: List[String] = Components.default_catalogs,
     components: List[String] = Nil
   ): List[String] = {
     val admin = Components.admin(Path.ISABELLE_HOME).implode
 
-    ("ISABELLE_COMPONENT_REPOSITORY=" + Bash.string(component_repository)) ::
     catalogs.map(name =>
       "init_components " + quote(components_base) + " " + quote(admin + "/" + name)) :::
     components.map(name =>
@@ -92,13 +90,15 @@
   def resolve_components(
     echo: Boolean = false,
     clean_platforms: Option[List[Platform.Family.Value]] = None,
-    clean_archives: Boolean = false
+    clean_archives: Boolean = false,
+    component_repository: String = Components.default_component_repository
   ): Unit = {
     val missing = Path.split(getenv("ISABELLE_COMPONENTS_MISSING"))
     for (path <- missing) {
       Components.resolve(path.dir, path.file_name,
         clean_platforms = clean_platforms,
         clean_archives = clean_archives,
+        component_repository = component_repository,
         ssh = ssh,
         progress = if (echo) progress else new Progress)
     }
@@ -153,13 +153,15 @@
     fresh: Boolean = false,
     echo: Boolean = false,
     clean_platforms: Option[List[Platform.Family.Value]] = None,
-    clean_archives: Boolean = false
+    clean_archives: Boolean = false,
+    component_repository: String = Components.default_component_repository
   ): Unit = {
     init_settings(other_settings)
     resolve_components(
       echo = echo,
       clean_platforms = clean_platforms,
-      clean_archives = clean_archives)
+      clean_archives = clean_archives,
+      component_repository = component_repository)
     scala_build(fresh = fresh, echo = echo)
   }