From dbc6b1e26a8556ad5f1be398bd42d3e15d6255d2 Mon Sep 17 00:00:00 2001 From: Julian Noble Date: Mon, 23 Sep 2024 05:36:30 +1000 Subject: [PATCH] retry fix punk::mix::cli --- src/bootsupport/modules/punk/mix/cli-0.3.1.tm | 16 +++++++++++----- src/modules/punk/mix/cli-999999.0a1.0.tm | 16 +++++++++++----- .../bootsupport/modules/punk/mix/cli-0.3.1.tm | 16 +++++++++++----- .../bootsupport/modules/punk/mix/cli-0.3.1.tm | 16 +++++++++++----- 4 files changed, 44 insertions(+), 20 deletions(-) diff --git a/src/bootsupport/modules/punk/mix/cli-0.3.1.tm b/src/bootsupport/modules/punk/mix/cli-0.3.1.tm index 4cde0057..6a1252f0 100644 --- a/src/bootsupport/modules/punk/mix/cli-0.3.1.tm +++ b/src/bootsupport/modules/punk/mix/cli-0.3.1.tm @@ -706,7 +706,7 @@ namespace eval punk::mix::cli { } else { #TODO - review punk::zip::mkzip and/or external zip to provide a fallback? set had_error 1 - lappend notest "zipfs_unavailable" + lappend notes "zipfs_unavailable" puts stderr "WARNING: zipfs unavailable can't build $modulefile" } @@ -744,10 +744,16 @@ namespace eval punk::mix::cli { # -- --- --- --- --- --- if {$did_skip} {set did_skip 0; puts -nonewline stdout \n} lappend module_list $modulefile - file copy -force $modulefile $target_module_dir - puts stderr "Copied zip modpod module $modulefile to $target_module_dir" - # -- --- --- --- --- --- - $event targetset_end OK -note "zip modpod" + if {[catch { + file copy -force $modulefile $target_module_dir + } errMsg]} { + puts stderr "FAILED to copy zip modpod module $modulefile to $target_module_dir" + $event targetset_end FAILED -note "could not copy $modulefile" + } else { + puts stderr "Copied zip modpod module $modulefile to $target_module_dir" + # -- --- --- --- --- --- + $event targetset_end OK -note "zip modpod" + } } else { puts -nonewline stderr "." set did_skip 1 diff --git a/src/modules/punk/mix/cli-999999.0a1.0.tm b/src/modules/punk/mix/cli-999999.0a1.0.tm index a3f7d913..fb2cb536 100644 --- a/src/modules/punk/mix/cli-999999.0a1.0.tm +++ b/src/modules/punk/mix/cli-999999.0a1.0.tm @@ -706,7 +706,7 @@ namespace eval punk::mix::cli { } else { #TODO - review punk::zip::mkzip and/or external zip to provide a fallback? set had_error 1 - lappend notest "zipfs_unavailable" + lappend notes "zipfs_unavailable" puts stderr "WARNING: zipfs unavailable can't build $modulefile" } @@ -744,10 +744,16 @@ namespace eval punk::mix::cli { # -- --- --- --- --- --- if {$did_skip} {set did_skip 0; puts -nonewline stdout \n} lappend module_list $modulefile - file copy -force $modulefile $target_module_dir - puts stderr "Copied zip modpod module $modulefile to $target_module_dir" - # -- --- --- --- --- --- - $event targetset_end OK -note "zip modpod" + if {[catch { + file copy -force $modulefile $target_module_dir + } errMsg]} { + puts stderr "FAILED to copy zip modpod module $modulefile to $target_module_dir" + $event targetset_end FAILED -note "could not copy $modulefile" + } else { + puts stderr "Copied zip modpod module $modulefile to $target_module_dir" + # -- --- --- --- --- --- + $event targetset_end OK -note "zip modpod" + } } else { puts -nonewline stderr "." set did_skip 1 diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm index 4cde0057..6a1252f0 100644 --- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm +++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm @@ -706,7 +706,7 @@ namespace eval punk::mix::cli { } else { #TODO - review punk::zip::mkzip and/or external zip to provide a fallback? set had_error 1 - lappend notest "zipfs_unavailable" + lappend notes "zipfs_unavailable" puts stderr "WARNING: zipfs unavailable can't build $modulefile" } @@ -744,10 +744,16 @@ namespace eval punk::mix::cli { # -- --- --- --- --- --- if {$did_skip} {set did_skip 0; puts -nonewline stdout \n} lappend module_list $modulefile - file copy -force $modulefile $target_module_dir - puts stderr "Copied zip modpod module $modulefile to $target_module_dir" - # -- --- --- --- --- --- - $event targetset_end OK -note "zip modpod" + if {[catch { + file copy -force $modulefile $target_module_dir + } errMsg]} { + puts stderr "FAILED to copy zip modpod module $modulefile to $target_module_dir" + $event targetset_end FAILED -note "could not copy $modulefile" + } else { + puts stderr "Copied zip modpod module $modulefile to $target_module_dir" + # -- --- --- --- --- --- + $event targetset_end OK -note "zip modpod" + } } else { puts -nonewline stderr "." set did_skip 1 diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm index 4cde0057..6a1252f0 100644 --- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm +++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm @@ -706,7 +706,7 @@ namespace eval punk::mix::cli { } else { #TODO - review punk::zip::mkzip and/or external zip to provide a fallback? set had_error 1 - lappend notest "zipfs_unavailable" + lappend notes "zipfs_unavailable" puts stderr "WARNING: zipfs unavailable can't build $modulefile" } @@ -744,10 +744,16 @@ namespace eval punk::mix::cli { # -- --- --- --- --- --- if {$did_skip} {set did_skip 0; puts -nonewline stdout \n} lappend module_list $modulefile - file copy -force $modulefile $target_module_dir - puts stderr "Copied zip modpod module $modulefile to $target_module_dir" - # -- --- --- --- --- --- - $event targetset_end OK -note "zip modpod" + if {[catch { + file copy -force $modulefile $target_module_dir + } errMsg]} { + puts stderr "FAILED to copy zip modpod module $modulefile to $target_module_dir" + $event targetset_end FAILED -note "could not copy $modulefile" + } else { + puts stderr "Copied zip modpod module $modulefile to $target_module_dir" + # -- --- --- --- --- --- + $event targetset_end OK -note "zip modpod" + } } else { puts -nonewline stderr "." set did_skip 1