diff --git a/ChangeLog b/ChangeLog index 09652bd..d5e2544 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,16 @@ Changes in version 1.9.4 - * templates/kde4 - Davide Madrisan: Remove 'Patch0' and '#%patch0 -p1' directives. + * lib/libnetwork.lib - Davide Madrisan: + repository.get_pckname_from_HTML: reworked to accept regular expessions. + + * pck-update - Davide Madrisan: + Action 0: display the entire list of packages when the user query is a + regular expression. + + * i18n - Davide Madrisan: + Updated. + -------------------------------------------------------------------------------- Changes in version 1.9.3 - April Fools' Day Release diff --git a/lib/libnetwork.lib.in b/lib/libnetwork.lib.in index d89ac7a..b014be2 100644 --- a/lib/libnetwork.lib.in +++ b/lib/libnetwork.lib.in @@ -1,6 +1,6 @@ #!/bin/bash # libnetwork.lib -- @package@ library to get info from internet repositories -# Copyright (C) 2008,2010 Davide Madrisan +# Copyright (C) 2008,2010,2012 Davide Madrisan [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 3 ] && { echo $"this script requires bash version 3 or better" >&2 && exit 1; } @@ -56,7 +56,7 @@ function repository.get_pckname_from_HTML() { /^$pck_name-[^-]\+-[^-]\+$/bm;be; :m;/^$pck_name-[^-]\+-[^-]\+$/p;:e" $infile) ) - echo "$pckname_from_HTML" + echo "${pckname_from_HTML[*]}" } # function repository.resolveURL() @@ -218,12 +218,12 @@ getting list of files from"" \`${NOTE}$currurl/${NORM}'..." notify.debug "$FUNCNAME: pck_name = $pck_name" if [ -s "${flist[$i]}" ]; then - got_SPEC_FILENAME=$(\ -repository.get_pckname_from_HTML "$pck_name" "${flist[$i]}") + got_SPEC_FILENAME=($(\ +repository.get_pckname_from_HTML "$pck_name" "${flist[$i]}")) [ "$got_SPEC_FILENAME" ] && { notify.debug "\ -$FUNCNAME: got_SPEC_FILENAME = $got_SPEC_FILENAME" +$FUNCNAME: got_SPEC_FILENAME = ${got_SPEC_FILENAME[*]}" got_SPEC_FILENAME_URL_LEVEL="$level" got_SPEC_FILENAME_URL="$currurl" break 2; } diff --git a/plugins/pck-update.in b/plugins/pck-update.in index 96451f9..df523d6 100644 --- a/plugins/pck-update.in +++ b/plugins/pck-update.in @@ -1179,10 +1179,14 @@ check for available versions in the $DISTRO repositories""${NORM}" if [[ "$got_SPEC_FILENAME" ]]; then [[ ${#got_SPEC_FILENAME[@]} -gt 1 ]] && - notify.warning $"found too many candidates" + notify.warning $"several occurrences found" notify.note \ -$"Repository"" : ${NOTE}(#$ftp_server_download_num) ${got_SPEC_FILENAME_URL}${NORM}" - notify.note $"Package(s)"" : ${NOTE}${got_SPEC_FILENAME[@]}${NORM}" +$"Repository""\ +: ${NOTE}(#$ftp_server_download_num) ${got_SPEC_FILENAME_URL}${NORM}" + for j in `seq 1 1 ${#got_SPEC_FILENAME[*]}`; do + notify.note \ +$"Package: - ""${NOTE}${got_SPEC_FILENAME[$(($j-1))]}${NORM}" + done else notify.warning $"\ cannot find a matching SRPM package in the given repositories" @@ -1199,11 +1203,13 @@ cannot find a matching SRPM package in the given repositories" if [[ "$got_SPEC_FILENAME" ]]; then [[ ${#got_SPEC_FILENAME[@]} -gt 1 ]] && - notify.warning $"found too many candidates" + notify.warning $"several occurrences found" notify.note \ $"Repository"" : ${NOTE}(#$(($i-1))) ${got_SPEC_FILENAME_URL}${NORM}" - notify.note $"Package(s)"" : ${NOTE}${got_SPEC_FILENAME[@]}${NORM}" - + for j in `seq 1 1 ${#got_SPEC_FILENAME[*]}`; do + notify.note \ +$"Package: - ""${NOTE}${got_SPEC_FILENAME[$(($j-1))]}${NORM}" + done let "srpm_pck_found += 1" fi done @@ -1233,7 +1239,7 @@ cannot find a matching SRPM package in the given repositories" [[ ${#got_SPEC_FILENAME[@]} -gt 1 ]] && notify.error $"\ -found too many candidates"": $( +too many packages found"": $( for f in ${got_SPEC_FILENAME[*]}; do echo -en "\n * $f" done )" @@ -2797,12 +2803,12 @@ $pck-$pck_rpmversion-$pck_rpmrelease$DISTRO_rpm.$target_cpu.rpm" if [[ ${#got_SPEC_FILENAME[@]} -gt 1 ]]; then if [ "$force_upload" = 1 ]; then # FIXME : add some extra checks - notify.warning $"found too many candidates"": $( + notify.warning $"too many packages found"": $( for f in ${got_SPEC_FILENAME[*]}; do echo -en "\n * \`$f' " done )" else - notify.error $"found too many candidates"": $( + notify.error $"too many packages found"": $( for f in ${got_SPEC_FILENAME[*]}; do echo -en "\n * \`$f' " done )" diff --git a/po/it/pck-update.po b/po/it/pck-update.po index 3b367b1..8a5d677 100644 --- a/po/it/pck-update.po +++ b/po/it/pck-update.po @@ -330,14 +330,17 @@ msgstr "aggiornamento del pacchetto ${NOTE}${pck_name##*/}${NORM} alla versione msgid "updating package" msgstr "aggiornamento del pacchetto" -msgid "found too many candidates" +msgid "too many packages found" msgstr "trovati troppi pacchetti candidati" +msgid "several occurrences found" +msgstr "trovati diversi pacchetti candidati" + msgid "Repository" msgstr "Archivio" -msgid "Package(s)" -msgstr "Pacchetto" +msgid "Package: - " +msgstr "Pacchetto: " msgid "cannot find a matching SRPM package in the given repositories" msgstr "impossibile trovare il pacchetto SRPM nei repository indicati"