Fix installation of yast2 based appdata.xml.gz files

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp-plugin-appdata?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2017-10-04 09:40:17 +00:00 committed by Git OBS Bridge
parent 35ac3f3454
commit 75701492b2
2 changed files with 6 additions and 1 deletions

View File

@ -44,7 +44,7 @@ while ([ "$1" = "-R" ]); do
# We do not validate an appdata.xml.gz in a yast2 repo: those are created by appstream-builder, and we can trust them # We do not validate an appdata.xml.gz in a yast2 repo: those are created by appstream-builder, and we can trust them
#if appstream-util validate-relax --nonet "$6$YAST2/appdata.xml.gz" 2>&1 > /dev/null; then #if appstream-util validate-relax --nonet "$6$YAST2/appdata.xml.gz" 2>&1 > /dev/null; then
# get the real appdata.xml.gz file name out of content # get the real appdata.xml.gz file name out of content
APPDATA=$(awk '/appdata.*xml.gz/ && !/failed/ {print $4}' "$6/content") APPDATA=$(awk '/appdata.*xml.gz/ && !/failed|ignore/ {print $4}' "$6/content")
appstream-util install-origin "$2" "$6$YAST2/${APPDATA}" "$6$YAST2/"appdata-icons*.tar.gz 2>&1 > /dev/null appstream-util install-origin "$2" "$6$YAST2/${APPDATA}" "$6$YAST2/"appdata-icons*.tar.gz 2>&1 > /dev/null
#fi #fi
;; ;;

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 4 09:39:20 UTC 2017 - dleuenberger@suse.com
- Do not consider appdata-ignore.xml.gz as appdata to be installed.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 14 08:49:26 UTC 2017 - dimstar@opensuse.org Fri Jul 14 08:49:26 UTC 2017 - dimstar@opensuse.org