From f860841a7e5b2f96e85628f031522a63968b2758 Mon Sep 17 00:00:00 2001 From: Phillip Smith Date: Wed, 15 May 2013 09:36:35 +1000 Subject: [PATCH] makepkg: list files containing $srcdir (FS#31558) when checking for files in a built package that contain references to $srcdir or $pkgdir_base, show the files that match to assist in debugging. --- scripts/makepkg.sh.in | 14 +++++++++----- scripts/po/ar.po | 2 +- scripts/po/ca.po | 2 +- scripts/po/cs.po | 2 +- scripts/po/da.po | 2 +- scripts/po/de.po | 2 +- scripts/po/el.po | 2 +- scripts/po/en_GB.po | 4 ++-- scripts/po/eo.po | 2 +- scripts/po/es.po | 2 +- scripts/po/fa.po | 2 +- scripts/po/fi.po | 2 +- scripts/po/fr.po | 2 +- scripts/po/gl.po | 2 +- scripts/po/hr.po | 2 +- scripts/po/hu.po | 2 +- scripts/po/id.po | 2 +- scripts/po/it.po | 2 +- scripts/po/ja.po | 2 +- scripts/po/kk.po | 2 +- scripts/po/ko.po | 2 +- scripts/po/lt.po | 2 +- scripts/po/nb.po | 2 +- scripts/po/nl.po | 2 +- scripts/po/pacman-scripts.pot | 2 +- scripts/po/pl.po | 2 +- scripts/po/pt.po | 2 +- scripts/po/pt_BR.po | 2 +- scripts/po/ro.po | 2 +- scripts/po/ru.po | 2 +- scripts/po/sk.po | 2 +- scripts/po/sl.po | 2 +- scripts/po/sr.po | 2 +- scripts/po/sr@latin.po | 2 +- scripts/po/sv.po | 2 +- scripts/po/tr.po | 2 +- scripts/po/uk.po | 2 +- scripts/po/zh_CN.po | 2 +- scripts/po/zh_TW.po | 2 +- 39 files changed, 48 insertions(+), 44 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 75ddfe5..70d39b7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1606,11 +1606,15 @@ tidy_install() { done # check for references to the build and package directory - if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then - warning "$(gettext "Package contains reference to %s")" "\$srcdir" - fi - if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdirbase}" ; then - warning "$(gettext "Package contains reference to %s")" "\$pkgdir" + srcdir_refs=$(cd "${pkgdir}" && find -type f -print0 | xargs -0 grep -I -l "${srcdir}") + if [[ -n $srcdir_refs ]] ; then + warning "$(gettext "The following files within the package reference %s")" "\$srcdir" + echo $srcdir_refs # quotes are important to maintain line breaks + fi + pkgdir_refs=$(cd "${pkgdir}" && find -type f -print0 | xargs -0 grep -I -l "${pkgdirbase}") + if [[ -n $pkgdir_refs ]] ; then + warning "$(gettext "The following files within the package reference %s")" "\$pkgdir" + echo "$pkgdir_refs" # quotes are important to maintain line breaks fi if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then diff --git a/scripts/po/ar.po b/scripts/po/ar.po index 1a3e00d..2daa15c 100644 --- a/scripts/po/ar.po +++ b/scripts/po/ar.po @@ -234,7 +234,7 @@ msgstr "" msgid "%s entry file not in package : %s" msgstr "" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "" msgid "Compressing man and info pages..." diff --git a/scripts/po/ca.po b/scripts/po/ca.po index e5b8d57..61a9f83 100644 --- a/scripts/po/ca.po +++ b/scripts/po/ca.po @@ -238,7 +238,7 @@ msgstr "S'estan eliminant els directoris buits..." msgid "%s entry file not in package : %s" msgstr "fitxer d'entrada %s no es troba en el paquet: %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "El paquet conté referències a %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/cs.po b/scripts/po/cs.po index e9f428e..5c6e10b 100644 --- a/scripts/po/cs.po +++ b/scripts/po/cs.po @@ -237,7 +237,7 @@ msgstr "Odstraňují se prázdné adresáře..." msgid "%s entry file not in package : %s" msgstr "%s soubor není v balíčku: %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Balíček obsahuje odkaz na %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/da.po b/scripts/po/da.po index 825c1a1..348b673 100644 --- a/scripts/po/da.po +++ b/scripts/po/da.po @@ -239,7 +239,7 @@ msgstr "Fjerner tomme mapper..." msgid "%s entry file not in package : %s" msgstr "%s pakkefil findes ikke i pakke: %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Pakke indeholder reference til %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/de.po b/scripts/po/de.po index e563d4e..d1fa15f 100644 --- a/scripts/po/de.po +++ b/scripts/po/de.po @@ -246,7 +246,7 @@ msgstr "Entferne leere Verzeichnisse... " msgid "%s entry file not in package : %s" msgstr "Eingetragene %s Datei nicht im Paket : %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Paket enthält einen Verweis auf %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/el.po b/scripts/po/el.po index 3be750b..7c8c1f6 100644 --- a/scripts/po/el.po +++ b/scripts/po/el.po @@ -238,7 +238,7 @@ msgstr "Διαγραφή κενών καταλόγων..." msgid "%s entry file not in package : %s" msgstr "Το αρχείο %s δεν βρίσκεται στο πακέτο: %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Το πακέτο περιέχει αναφορά στο %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/en_GB.po b/scripts/po/en_GB.po index 0567ba6..a079e87 100644 --- a/scripts/po/en_GB.po +++ b/scripts/po/en_GB.po @@ -235,8 +235,8 @@ msgstr "Removing empty directories..." msgid "%s entry file not in package : %s" msgstr "%s entry file not in package : %s" -msgid "Package contains reference to %s" -msgstr "Package contains reference to %s" +msgid "The following files within the package reference%s" +msgstr "The following files within the package reference%s" msgid "Compressing man and info pages..." msgstr "Compressing man and info pages..." diff --git a/scripts/po/eo.po b/scripts/po/eo.po index dbd196f..bd81e08 100644 --- a/scripts/po/eo.po +++ b/scripts/po/eo.po @@ -231,7 +231,7 @@ msgstr "" msgid "%s entry file not in package : %s" msgstr "" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "" msgid "Compressing man and info pages..." diff --git a/scripts/po/es.po b/scripts/po/es.po index d531f38..03ceec6 100644 --- a/scripts/po/es.po +++ b/scripts/po/es.po @@ -241,7 +241,7 @@ msgstr "Quitando directorios vacíos... " msgid "%s entry file not in package : %s" msgstr "Archivo de entrada %s inexistente en el paquete: %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "El paquete contiene referencias a %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/fa.po b/scripts/po/fa.po index 5171d87..8fc19cb 100644 --- a/scripts/po/fa.po +++ b/scripts/po/fa.po @@ -231,7 +231,7 @@ msgstr "" msgid "%s entry file not in package : %s" msgstr "" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "" msgid "Compressing man and info pages..." diff --git a/scripts/po/fi.po b/scripts/po/fi.po index b998ae1..62d1407 100644 --- a/scripts/po/fi.po +++ b/scripts/po/fi.po @@ -238,7 +238,7 @@ msgstr "Poistetaan tyhjiä kansioita..." msgid "%s entry file not in package : %s" msgstr "%s-merkittyä tiedostoa ei paketissa : %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Paketti sisältää viitteitä kohteeseen %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/fr.po b/scripts/po/fr.po index 2aa214d..711c080 100644 --- a/scripts/po/fr.po +++ b/scripts/po/fr.po @@ -246,7 +246,7 @@ msgstr "Suppression des répertoires vides... " msgid "%s entry file not in package : %s" msgstr "Le fichier %s n’est pas dans le paquet %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Le paquet contient une référence à %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/gl.po b/scripts/po/gl.po index ef7759e..441ce58 100644 --- a/scripts/po/gl.po +++ b/scripts/po/gl.po @@ -231,7 +231,7 @@ msgstr "" msgid "%s entry file not in package : %s" msgstr "" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "" msgid "Compressing man and info pages..." diff --git a/scripts/po/hr.po b/scripts/po/hr.po index abdc5f0..50a9c1c 100644 --- a/scripts/po/hr.po +++ b/scripts/po/hr.po @@ -233,7 +233,7 @@ msgstr "Uklanjam prazne direktorije..." msgid "%s entry file not in package : %s" msgstr "%s datoteka unosa nije u paketu : %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "" msgid "Compressing man and info pages..." diff --git a/scripts/po/hu.po b/scripts/po/hu.po index e8dc019..22ff632 100644 --- a/scripts/po/hu.po +++ b/scripts/po/hu.po @@ -236,7 +236,7 @@ msgstr "Üres könyvtárak eltávolítása..." msgid "%s entry file not in package : %s" msgstr "A %s bejegyzés nincs a csomagban : %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "A csomag hivatkozik a(z) %s-re" msgid "Compressing man and info pages..." diff --git a/scripts/po/id.po b/scripts/po/id.po index 6f393b9..4e084e1 100644 --- a/scripts/po/id.po +++ b/scripts/po/id.po @@ -235,7 +235,7 @@ msgstr "Menghapus direktori kosong..." msgid "%s entry file not in package : %s" msgstr "Berkas masukan %s tidak terdapat pada paket: %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Paket mengandung acuan ke %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/it.po b/scripts/po/it.po index 15f8840..e446518 100644 --- a/scripts/po/it.po +++ b/scripts/po/it.po @@ -237,7 +237,7 @@ msgstr "Rimozione delle directory vuote in corso..." msgid "%s entry file not in package : %s" msgstr "La voce del backup %s non è nel pacchetto : %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Il pacchetto contiene dei riferimenti a %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/ja.po b/scripts/po/ja.po index 2f673c1..ac9e71b 100644 --- a/scripts/po/ja.po +++ b/scripts/po/ja.po @@ -233,7 +233,7 @@ msgstr "空のディレクトリを削除..." msgid "%s entry file not in package : %s" msgstr "%s エントリファイルがパッケージにありません : %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "パッケージは %s へのリファレンスを含んでいます" msgid "Compressing man and info pages..." diff --git a/scripts/po/kk.po b/scripts/po/kk.po index dea2799..510f97a 100644 --- a/scripts/po/kk.po +++ b/scripts/po/kk.po @@ -232,7 +232,7 @@ msgstr "Бос бумаларды өшіру..." msgid "%s entry file not in package : %s" msgstr "" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Дестеде %s жеріне сілтеме бар" msgid "Compressing man and info pages..." diff --git a/scripts/po/ko.po b/scripts/po/ko.po index 18a98d9..259a347 100644 --- a/scripts/po/ko.po +++ b/scripts/po/ko.po @@ -232,7 +232,7 @@ msgstr "빈 디렉토리 삭제 중..." msgid "%s entry file not in package : %s" msgstr "" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "" msgid "Compressing man and info pages..." diff --git a/scripts/po/lt.po b/scripts/po/lt.po index 158928e..5a50483 100644 --- a/scripts/po/lt.po +++ b/scripts/po/lt.po @@ -241,7 +241,7 @@ msgstr "Šalinami tušti aplankai..." msgid "%s entry file not in package : %s" msgstr "Įrašo failo %s pakete nėra : %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Paketas turi nuorodą į %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/nb.po b/scripts/po/nb.po index 559fb72..5446980 100644 --- a/scripts/po/nb.po +++ b/scripts/po/nb.po @@ -235,7 +235,7 @@ msgstr "Fjerner tomme mapper..." msgid "%s entry file not in package : %s" msgstr "%s oppføring ikke funnet i pakke: %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Pakken inneholder referanser til %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/nl.po b/scripts/po/nl.po index 9358243..5618a05 100644 --- a/scripts/po/nl.po +++ b/scripts/po/nl.po @@ -231,7 +231,7 @@ msgstr "" msgid "%s entry file not in package : %s" msgstr "" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "" msgid "Compressing man and info pages..." diff --git a/scripts/po/pacman-scripts.pot b/scripts/po/pacman-scripts.pot index e21b161..fcf3312 100644 --- a/scripts/po/pacman-scripts.pot +++ b/scripts/po/pacman-scripts.pot @@ -230,7 +230,7 @@ msgstr "" msgid "%s entry file not in package : %s" msgstr "" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "" msgid "Compressing man and info pages..." diff --git a/scripts/po/pl.po b/scripts/po/pl.po index bd9d523..e699e5e 100644 --- a/scripts/po/pl.po +++ b/scripts/po/pl.po @@ -241,7 +241,7 @@ msgstr "Usuwam puste katalogi..." msgid "%s entry file not in package : %s" msgstr "" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Pakiet zawiera odwołanie do %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/pt.po b/scripts/po/pt.po index 2d3454c..501d5d1 100644 --- a/scripts/po/pt.po +++ b/scripts/po/pt.po @@ -237,7 +237,7 @@ msgstr "A remover diretórios vazios..." msgid "%s entry file not in package : %s" msgstr "O ficheiro mencionado %s não está no pacote : %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Pacote contém referência a %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/pt_BR.po b/scripts/po/pt_BR.po index d08df87..7094e59 100644 --- a/scripts/po/pt_BR.po +++ b/scripts/po/pt_BR.po @@ -236,7 +236,7 @@ msgstr "Removendo diretórios vazios..." msgid "%s entry file not in package : %s" msgstr "Arquivo de entrada %s não está no pacote : %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Pacote contém referência para %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/ro.po b/scripts/po/ro.po index 0a8d2cb..23c141d 100644 --- a/scripts/po/ro.po +++ b/scripts/po/ro.po @@ -239,7 +239,7 @@ msgstr "Se elimină directoarele goale..." msgid "%s entry file not in package : %s" msgstr "Fișierul din intrarea %s nu este în pachet: %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Pachetul conține referințe către %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/ru.po b/scripts/po/ru.po index 40f273a..ebdeffa 100644 --- a/scripts/po/ru.po +++ b/scripts/po/ru.po @@ -241,7 +241,7 @@ msgstr "Удаление пустых каталогов..." msgid "%s entry file not in package : %s" msgstr "%s файл не содержится в пакете : %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Пакет содержит ссылку на %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/sk.po b/scripts/po/sk.po index 5ea7845..8057a44 100644 --- a/scripts/po/sk.po +++ b/scripts/po/sk.po @@ -238,7 +238,7 @@ msgstr "Odstraňujem prázdne adresáre..." msgid "%s entry file not in package : %s" msgstr "%s vstupný súbor nie je v balíčku: %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Balíček obsahuje odkaz na %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/sl.po b/scripts/po/sl.po index 20bf137..39c1ef5 100644 --- a/scripts/po/sl.po +++ b/scripts/po/sl.po @@ -237,7 +237,7 @@ msgstr "Odstranjevanje praznih imenikov..." msgid "%s entry file not in package : %s" msgstr "" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "" msgid "Compressing man and info pages..." diff --git a/scripts/po/sr.po b/scripts/po/sr.po index 67677b7..ef26469 100644 --- a/scripts/po/sr.po +++ b/scripts/po/sr.po @@ -237,7 +237,7 @@ msgstr "Уклањам празне фасцикле..." msgid "%s entry file not in package : %s" msgstr "%s фајл уноса није у пакету : %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Пакет садржи референцу ка %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/sr@latin.po b/scripts/po/sr@latin.po index 8053424..ce366db 100644 --- a/scripts/po/sr@latin.po +++ b/scripts/po/sr@latin.po @@ -237,7 +237,7 @@ msgstr "Uklanjam prazne fascikle..." msgid "%s entry file not in package : %s" msgstr "%s fajl unosa nije u paketu : %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Paket sadrži referencu ka %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/sv.po b/scripts/po/sv.po index bae5f43..74bc84b 100644 --- a/scripts/po/sv.po +++ b/scripts/po/sv.po @@ -232,7 +232,7 @@ msgstr "Tar bort tomma katalaoger..." msgid "%s entry file not in package : %s" msgstr "" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Paketet innehåller referens till %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/tr.po b/scripts/po/tr.po index da1a439..63fd912 100644 --- a/scripts/po/tr.po +++ b/scripts/po/tr.po @@ -237,7 +237,7 @@ msgstr "Boş dizinler kaldırılıyor..." msgid "%s entry file not in package : %s" msgstr "%s girdi dosyası paket içinde değil: %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Paket %s için referans barındırıyor" msgid "Compressing man and info pages..." diff --git a/scripts/po/uk.po b/scripts/po/uk.po index 6b23551..d6b7b5c 100644 --- a/scripts/po/uk.po +++ b/scripts/po/uk.po @@ -236,7 +236,7 @@ msgstr "Вилучення порожніх каталогів..." msgid "%s entry file not in package : %s" msgstr "Вхідний файл %s не міститься в пакунку: %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "Пакунок не містить згадки про %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/zh_CN.po b/scripts/po/zh_CN.po index 4cb352c..114d301 100644 --- a/scripts/po/zh_CN.po +++ b/scripts/po/zh_CN.po @@ -237,7 +237,7 @@ msgstr "正在删除空目录..." msgid "%s entry file not in package : %s" msgstr "%s 条目文件不在软件包内： %s" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "软件包提及含有 %s" msgid "Compressing man and info pages..." diff --git a/scripts/po/zh_TW.po b/scripts/po/zh_TW.po index 4d5fb41..d8518a7 100644 --- a/scripts/po/zh_TW.po +++ b/scripts/po/zh_TW.po @@ -231,7 +231,7 @@ msgstr "" msgid "%s entry file not in package : %s" msgstr "" -msgid "Package contains reference to %s" +msgid "The following files within the package reference%s" msgstr "" msgid "Compressing man and info pages..." -- 1.8.2.3