From b6d936095ddfd0374ed501583d7c2755d5e69a6f Mon Sep 17 00:00:00 2001 From: David P Date: Thu, 6 Sep 2018 00:48:26 -0300 Subject: find-deprecated-pkgs: advise when there are no pkgs to remove Signed-off-by: David P --- blacklist.txt | 11 +++++++++++ find-deprecated-pkgs | 20 ++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/blacklist.txt b/blacklist.txt index 8e469d6..01384fc 100644 --- a/blacklist.txt +++ b/blacklist.txt @@ -336,15 +336,20 @@ java-runtime-common:java-runtime-common:::[branding][FIXME:description] java-xmlgraphics-commons:java-xmlgraphics-commons:::[technical] Arch version was not built from source jdk7-openjdk:jdk7-openjdk:::[branding][FIXME:description] jdk8-openjdk:jdk8-openjdk:::[branding][FIXME:description] +jdk9-openjdk:jdk9-openjdk:::[branding][FIXME:description] jedit:jedit:::[technical] Arch version uses jar file to compile sources jmol:jmol:::[technical] Arch version was not built from source jre7-openjdk-headless:jre7-openjdk-headless:::[branding][FIXME:description] jre7-openjdk:jre7-openjdk:::[branding][FIXME:description] jre8-openjdk-headless:jre8-openjdk-headless:::[branding][FIXME:description] jre8-openjdk:jre8-openjdk:::[branding][FIXME:description] +jre9-openjdk-headless:jre9-openjdk-headless:::[branding][FIXME:description] +jre9-openjdk:jre9-openjdk:::[branding][FIXME:description] jsampler::::[uses-nonfree] only useful with nonfree linuxsampler junit:junit:::[technical] Arch version was not built from source +kdebase-runtime:kdebase-runtime:::[uses-nonfree] has non-privacy search engines by default kde-development-environment-meta:kde-development-environment-meta:::[uses-nonfree] depends on nonfree qt5-webengine +kdelibs:kdelibs:::[FIXME:description] kdepim-addons:kdepim-addons:::[uses-nonfree] built with nonfree qt5-webengine kdepim-runtime:kdepim-runtime:::[uses-nonfree] built with nonfree qt5-webengine kdevelop:kdevelop:::[uses-nonfree] depends on nonfree qt5-webengine @@ -445,6 +450,8 @@ linux-zen-docs:linux-libre-pck-docs:::[semifree] docs comes from nonfree linux-z linux-zen-headers:linux-libre-pck-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source linux-zen:linux-libre-pck:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares lsb-release:lsb-release:::[branding][FIXME:description] +luxrays:luxrays:::[uses-nonfree] recommends nonfree opencl optional installation +luxrender:luxrender:::[uses-nonfree] recommends nonfree opencl optional installation mac::fsf:Monkey.27s_Audio_Codec:[nonfree] Monkey's Audio Source Code License Agreement, changes must be contributed back mari0::::[nonfree] is licensed under cc-by-nc-sa mate-icon-theme-faenza:mate-icon-theme-faenza:::[uses-nonfree] has nonfree distros and application icons @@ -596,6 +603,7 @@ riot-desktop::parabola:1380:[uses-nonfree] depends on nonfree electron riscv64-linux-gnu-linux-api-headers:riscv64-linux-gnu-linux-libre-api-headers:::[semifree] has source containing and recommending nonfree software rp-pppoe:rp-pppoe:::[semifree] installs documentation about nonfree counterpart ruby2.3:ruby2.3:parabola:674:[semifree] json module has nonfree CVTUTF code; replace with pure Ruby implementation +ruby2.4:ruby2.4:parabola:674:[semifree] json module has nonfree CVTUTF code; replace with pure Ruby implementation ruby-docs:ruby-docs:parabola:674:[semifree] Rebuilt as part of 'ruby' package ruby:ruby:parabola:674:[semifree] json module has nonfree CVTUTF code; replace with pure Ruby implementation sane-gt68xx-firmware::::[nonfree] Contains nonfree Software @@ -636,6 +644,7 @@ thunderbird-i18n-ar:icedove-l10n-ar:::[semifree][FIXME:description] thunderbird-i18n-ast:icedove-l10n-ast:::[semifree][FIXME:description] thunderbird-i18n-be:icedove-l10n-be:::[semifree][FIXME:description] thunderbird-i18n-bg:icedove-l10n-bg:::[semifree][FIXME:description] +thunderbird-i18n-bn-bd:icedove-l10n-bn-bd:::[semifree][FIXME:description] thunderbird-i18n-br:icedove-l10n-br:::[semifree][FIXME:description] thunderbird-i18n-ca:icedove-l10n-ca:::[semifree][FIXME:description] thunderbird-i18n-cs:icedove-l10n-cs:::[semifree][FIXME:description] @@ -670,6 +679,7 @@ thunderbird-i18n-lt:icedove-l10n-lt:::[semifree][FIXME:description] thunderbird-i18n-nb-no:icedove-l10n-nb-no:::[semifree][FIXME:description] thunderbird-i18n-nl:icedove-l10n-nl:::[semifree][FIXME:description] thunderbird-i18n-nn-no:icedove-l10n-nn-no:::[semifree][FIXME:description] +thunderbird-i18n-pa-in:icedove-l10n-pa-in:::[semifree][FIXME:description] thunderbird-i18n-pl:icedove-l10n-pl:::[semifree][FIXME:description] thunderbird-i18n-pt-br:icedove-l10n-pt-br:::[semifree][FIXME:description] thunderbird-i18n-pt-pt:icedove-l10n-pt-pt:::[semifree][FIXME:description] @@ -682,6 +692,7 @@ thunderbird-i18n-sl:icedove-l10n-sl:::[semifree][FIXME:description] thunderbird-i18n-sq:icedove-l10n-sq:::[semifree][FIXME:description] thunderbird-i18n-sr:icedove-l10n-sr:::[semifree][FIXME:description] thunderbird-i18n-sv-se:icedove-l10n-sv-se:::[semifree][FIXME:description] +thunderbird-i18n-ta-lk:icedove-l10n-ta-lk:::[semifree][FIXME:description] thunderbird-i18n-tr:icedove-l10n-tr:::[semifree][FIXME:description] thunderbird-i18n-uk:icedove-l10n-uk:::[semifree][FIXME:description] thunderbird-i18n-vi:icedove-l10n-vi:::[semifree][FIXME:description] diff --git a/find-deprecated-pkgs b/find-deprecated-pkgs index 246369e..e2bd276 100755 --- a/find-deprecated-pkgs +++ b/find-deprecated-pkgs @@ -128,7 +128,6 @@ submsg() { "$(tput bold;tput setaf 4)" \ "$(tput sgr0)" \ "$1" - out=x } get_libre_pkgs() { @@ -150,6 +149,10 @@ get_libre_pkgs() { fi } +add(){ + list=$(( $list + 1 )) +} + compare_pkgs(){ # $1 is the pkgname and replacement (used when checking Arch pkgs) # $2 is the packages file list @@ -206,8 +209,10 @@ compare_pkgs(){ # Arch if [[ ${is_not_for[@]} = "x86_64 i686 armv7h" ]]; then submsg "$package was not found" + add elif [[ ${to_be_removed[@]} = "x86_64 i686 armv7h" ]]; then submsg "$package was not found, but we've [libre] replacements which should be removed" + add elif ! [[ ${is_not_for[@]} = "" ]] || ! [[ ${to_be_removed[@]} = "" ]]; then for arch in ${to_be_removed[@]}; do # If the replacement is available for the three arch'es supported @@ -217,6 +222,7 @@ compare_pkgs(){ done if ! [[ ${arches[*]} = "x86_64 i686 armv7h" ]]; then submsg "$package ($arch) was not found, but we've a [libre] replacement which should be removed" + add fi unset arches done @@ -225,9 +231,11 @@ compare_pkgs(){ # Parabola if [[ ${isnt_for[@]} = "x86_64 i686 armv7h" ]]; then submsg "$package was not found" + add elif ! [[ ${isnt_for[@]} = "" ]]; then for arch in ${to_be_deleted[@]}; do submsg "$package ($arch) was not found, but we've $replacement as replacement and should be removed" + add done fi @@ -249,9 +257,7 @@ check(){ for p in $pkgs; do compare_pkgs $p $parabola_pkgs done - rm -f $parabola_pkgs $libre_pkgs - if [[ $out = x ]]; then submsg 'The blacklist matches all packages correctly'; fi - msg 'done' + rm -f $parabola_pkgs ;; arch) msg 'Comparing blacklists with Arch packages ...' pkgs=$(for bl in $blacklists; do grep -v ^# $bl | awk '{print $1}'; done) @@ -259,12 +265,14 @@ check(){ compare_pkgs $p $arch_pkgs done rm -f $arch_pkgs $libre_pkgs - if [[ $out = x ]]; then submsg 'The blacklist matches all packages correctly'; fi - msg 'done' ;; *) err "$1 is not a valid argument" ;; esac + if ! [[ $list -gt 0 ]]; then + submsg 'No packages to show' + fi + msg 'done' } if [[ $@ = "" ]]; then -- cgit v1.2.2