prefer strict result (in contrast to 0f3b0a929c02);
authorwenzelm
Thu May 25 21:59:53 2017 +0200 (2017-05-25)
changeset 65929de3adcf6a276
parent 65928 38eb5d633b0b
child 65930 9a28fc03c3fe
prefer strict result (in contrast to 0f3b0a929c02);
src/Pure/Admin/build_history.scala
src/Pure/Admin/isabelle_cronjob.scala
     1.1 --- a/src/Pure/Admin/build_history.scala	Thu May 25 21:55:17 2017 +0200
     1.2 +++ b/src/Pure/Admin/build_history.scala	Thu May 25 21:59:53 2017 +0200
     1.3 @@ -410,7 +410,7 @@
     1.4      push_isabelle_home: Boolean = false,
     1.5      progress: Progress = No_Progress,
     1.6      options: String = "",
     1.7 -    args: String = ""): (List[(String, Bytes)], Process_Result) =
     1.8 +    args: String = ""): List[(String, Bytes)] =
     1.9    {
    1.10      val isabelle_admin = isabelle_repos_self + Path.explode("Admin")
    1.11  
    1.12 @@ -455,26 +455,22 @@
    1.13      {
    1.14        val output_file = tmp_dir + Path.explode("output")
    1.15  
    1.16 -      val process_result =
    1.17 -        ssh.execute(
    1.18 -          Isabelle_System.export_isabelle_identifier(isabelle_identifier) +
    1.19 -          ssh.bash_path(isabelle_admin + Path.explode("build_history")) +
    1.20 -            " -o " + ssh.bash_path(output_file) + " " + options + " " +
    1.21 -            ssh.bash_path(isabelle_repos_other) + " " + args,
    1.22 -          progress_stdout = progress.echo(_),
    1.23 -          progress_stderr = progress.echo(_),
    1.24 -          strict = false)
    1.25 +      ssh.execute(
    1.26 +        Isabelle_System.export_isabelle_identifier(isabelle_identifier) +
    1.27 +        ssh.bash_path(isabelle_admin + Path.explode("build_history")) +
    1.28 +          " -o " + ssh.bash_path(output_file) + " " + options + " " +
    1.29 +          ssh.bash_path(isabelle_repos_other) + " " + args,
    1.30 +        progress_stdout = progress.echo(_),
    1.31 +        progress_stderr = progress.echo(_),
    1.32 +        strict = false).check
    1.33  
    1.34 -      val result =
    1.35 -        for (line <- split_lines(ssh.read(output_file)))
    1.36 -        yield {
    1.37 -          val log = Path.explode(line)
    1.38 -          val bytes = ssh.read_bytes(log)
    1.39 -          ssh.rm(log)
    1.40 -          (log.base.implode, bytes)
    1.41 -        }
    1.42 -
    1.43 -      (result, process_result)
    1.44 +      for (line <- split_lines(ssh.read(output_file)))
    1.45 +      yield {
    1.46 +        val log = Path.explode(line)
    1.47 +        val bytes = ssh.read_bytes(log)
    1.48 +        ssh.rm(log)
    1.49 +        (log.base.implode, bytes)
    1.50 +      }
    1.51      })
    1.52    }
    1.53  }
     2.1 --- a/src/Pure/Admin/isabelle_cronjob.scala	Thu May 25 21:55:17 2017 +0200
     2.2 +++ b/src/Pure/Admin/isabelle_cronjob.scala	Thu May 25 21:59:53 2017 +0200
     2.3 @@ -230,7 +230,7 @@
     2.4                val self_update = !r.shared_home
     2.5                val push_isabelle_home = self_update && Mercurial.is_repository(Path.explode("~~"))
     2.6  
     2.7 -              val (results, _) =
     2.8 +              val results =
     2.9                  Build_History.remote_build_history(ssh,
    2.10                    isabelle_repos,
    2.11                    isabelle_repos.ext(r.host),