From 4f44b8b8250a6dcec78ba3691a91ce866da0a899 Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Fri, 4 May 2012 23:30:40 +0200 Subject: [PATCH] pck-update: package.update(): better notification message Signed-off-by: Davide Madrisan --- plugins/pck-update.in | 17 ++++++++++++++--- po/it/pck-update.po | 6 ++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/plugins/pck-update.in b/plugins/pck-update.in index aca3b55..554da2a 100644 --- a/plugins/pck-update.in +++ b/plugins/pck-update.in @@ -1172,11 +1172,22 @@ echo -n "\"${define_list_value[$i]}\" "; done)]" notify.debug "\ define_list_rpm = \"$define_list_rpm\"" - if [ "$pck_newver" ]; then - notify.note $"updating package ${NOTE}${pck_name##*/}${NORM} \ + if [[ "$pck_name" =~ ^[a-zA-Z0-9-]+$ ]]; then + if [ "$pck_newver" ]; then + notify.note $"updating package ${NOTE}${pck_name##*/}${NORM} \ to version ${NOTE}${pck_newver}${NORM}""..." + else + notify.note $"updating package"" ${NOTE}${pck_name##*/}${NORM}..." + fi else - notify.note $"updating package"" ${NOTE}${pck_name##*/}${NORM}..." + # not a real package but a regexp + if [ "$pck_newver" ]; then + notify.note $"multiple package update (regexp: \ +${NOTE}$pck_name${NORM}) to version ${NOTE}${pck_newver}${NORM}""..." + else + notify.note $"multiple package update (regexp: \ +${NOTE}$pck_name${NORM})""..." + fi fi for step in ${steps[*]}; do diff --git a/po/it/pck-update.po b/po/it/pck-update.po index 7948646..336d0e0 100644 --- a/po/it/pck-update.po +++ b/po/it/pck-update.po @@ -333,6 +333,12 @@ msgstr "aggiornamento del pacchetto ${NOTE}${pck_name##*/}${NORM} alla versione msgid "updating package" msgstr "aggiornamento del pacchetto" +msgid "multiple package update (regexp: ${NOTE}$pck_name${NORM}) to version ${NOTE}${pck_newver}${NORM}" +msgstr "aggiornamento multiplo di pacchetti (${NOTE}$pck_name${NORM}) alla versione ${NOTE}${pck_newver}${NORM}" + +msgid "multiple package update (regexp: ${NOTE}$pck_name${NORM})" +msgstr "aggiornamento multiplo di pacchetti (${NOTE}$pck_name${NORM})" + msgid "too many packages found" msgstr "trovati troppi pacchetti candidati"