diff options
| author | P. J. McDermott <pj@pehjota.net> | 2014-04-30 17:29:23 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2014-04-30 17:30:17 (EDT) |
| commit | 540d3e7db83309ae026ece47933214d7647435ea (patch) | |
| tree | 95a010a3bd01b663d416a9977cd2908693f5d932 | |
| parent | 103391af25be259721d647d7970f1d08737ff90a (diff) | |
Move package removal message.
Also, make it a little more verbose.
| -rw-r--r-- | lib/cmd/remove.sh | 3 | ||||
| -rw-r--r-- | lib/remove.sh | 5 | ||||
| -rw-r--r-- | locale/en_US/pro_archman.sh | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/lib/cmd/remove.sh b/lib/cmd/remove.sh index a5dd1a0..30dffa6 100644 --- a/lib/cmd/remove.sh +++ b/lib/cmd/remove.sh @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -use locale -use output use remove cmd_remove_main() @@ -36,7 +34,6 @@ cmd_remove_main() chan="${conf_incoming_channel}" fi - info "$(get_msg 'cmd_remove_removing')" "${source}" "${chan}" "${dist}" remove_source_from_suite "${chan}" "${dist}" "${source}" fini diff --git a/lib/remove.sh b/lib/remove.sh index 25687b4..aecd6e7 100644 --- a/lib/remove.sh +++ b/lib/remove.sh @@ -20,6 +20,8 @@ [ "x${_REMOVE_SM+set}" = 'xset' ] && return 0 _REMOVE_SM=1 +use locale +use output use db remove_source_from_suite() @@ -30,6 +32,9 @@ remove_source_from_suite() local arch= local plat= + info "$(get_msg 'removing_from_suite')" \ + "${source}" "${chan}" "${dist}" + while read -r arch plat; do remove_packages_from_suite_archplat \ "${chan}" "${dist}" "${arch}" "${plat}" "${source}" diff --git a/locale/en_US/pro_archman.sh b/locale/en_US/pro_archman.sh index e43f82a..e9d9650 100644 --- a/locale/en_US/pro_archman.sh +++ b/locale/en_US/pro_archman.sh @@ -63,7 +63,9 @@ msg_pro_archman_cmd_process_incoming_processing='Processing changes in incoming. # lib/cmd/remove.sh msg_pro_archman_cmd_remove_summary='remove packages from a suite' msg_pro_archman_cmd_remove_usage='<suite> <source>' -msg_pro_archman_cmd_remove_removing='Removing %s from %s/%s...' + +# lib/remove.sh +msg_pro_archman_removing_from_suite='Removing package %s from suite %s/%s...' # lib/cmd/copy-suite.sh msg_pro_archman_cmd_copy_suite_summary='copy packages from one suite to another' |