diff options
| author | P. J. McDermott <pj@pehjota.net> | 2014-04-30 17:16:41 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2014-04-30 17:16:41 (EDT) |
| commit | 103391af25be259721d647d7970f1d08737ff90a (patch) | |
| tree | ba15fda889640f702076546f766b7da9e8b43ce2 | |
| parent | d3bb18a3f7ac78beae7bf639f278e73eb1dd0dbb (diff) | |
Move suite-related messages.
| -rw-r--r-- | lib/cmd/copy-suite.sh | 2 | ||||
| -rw-r--r-- | lib/cmd/remove-suite.sh | 2 | ||||
| -rw-r--r-- | lib/suite.sh | 8 | ||||
| -rw-r--r-- | locale/en_US/pro_archman.sh | 6 |
4 files changed, 12 insertions, 6 deletions
diff --git a/lib/cmd/copy-suite.sh b/lib/cmd/copy-suite.sh index 304b3fd..987fb45 100644 --- a/lib/cmd/copy-suite.sh +++ b/lib/cmd/copy-suite.sh @@ -41,8 +41,6 @@ cmd_copy_suite_main() dst_chan="${conf_incoming_channel}" fi - info "$(get_msg 'cmd_copy_suite_copying')" \ - "${src_chan}" "${src_dist}" "${dst_chan}" "${dst_dist}" copy_suite "${src_chan}" "${src_dist}" "${dst_chan}" "${dst_dist}" fini diff --git a/lib/cmd/remove-suite.sh b/lib/cmd/remove-suite.sh index 5fbc46c..5fc24ae 100644 --- a/lib/cmd/remove-suite.sh +++ b/lib/cmd/remove-suite.sh @@ -33,8 +33,6 @@ cmd_remove_suite_main() chan="${conf_incoming_channel}" fi - info "$(get_msg 'cmd_remove_suite_removing')" \ - "${chan}" "${dist}" remove_suite "${chan}" "${dist}" fini diff --git a/lib/suite.sh b/lib/suite.sh index 9a55809..4de39ef 100644 --- a/lib/suite.sh +++ b/lib/suite.sh @@ -23,6 +23,8 @@ _SUITE_SM=1 use db use dir use remove +use locale +use output copy_suite() { @@ -31,6 +33,9 @@ copy_suite() local dst_chan="${3}" local dst_dist="${4}" + info "$(get_msg 'suite_copying')" \ + "${src_chan}" "${src_dist}" "${dst_chan}" "${dst_dist}" + remove_suite "${dst_chan}" "${dst_dist}" db_foreach_source "${src_chan}" "${src_dist}" _suite_copy_source \ @@ -42,6 +47,9 @@ remove_suite() local chan="${1}" local dist="${2}" + info "$(get_msg 'suite_removing')" \ + "${chan}" "${dist}" + db_foreach_source "${chan}" "${dist}" _suite_remove_source } diff --git a/locale/en_US/pro_archman.sh b/locale/en_US/pro_archman.sh index a01aa33..e43f82a 100644 --- a/locale/en_US/pro_archman.sh +++ b/locale/en_US/pro_archman.sh @@ -68,12 +68,14 @@ msg_pro_archman_cmd_remove_removing='Removing %s from %s/%s...' # lib/cmd/copy-suite.sh msg_pro_archman_cmd_copy_suite_summary='copy packages from one suite to another' msg_pro_archman_cmd_copy_suite_usage='<source-suite> <destination-suite>' -msg_pro_archman_cmd_copy_suite_copying='Copying suite %s/%s to suite %s/%s...' # lib/cmd/remove-suite.sh msg_pro_archman_cmd_remove_suite_summary='remove a suite' msg_pro_archman_cmd_remove_suite_usage='<suite>' -msg_pro_archman_cmd_remove_suite_removing='Removing suite %s/%s...' + +# lib/suite.sh +msg_pro_archman_suite_copying='Copying suite %s/%s to suite %s/%s...' +msg_pro_archman_suite_removing='Removing suite %s/%s...' # lib/control.sh msg_pro_archman_control_empty_line='empty line' |