Hello community,

here is the log from the commit of package libzypp-plugin-appdata for 
openSUSE:Factory checked in at 2016-07-15 12:55:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzypp-plugin-appdata (Old)
 and      /work/SRC/openSUSE:Factory/.libzypp-plugin-appdata.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libzypp-plugin-appdata"

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/libzypp-plugin-appdata/libzypp-plugin-appdata.changes
    2016-05-04 08:18:49.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.libzypp-plugin-appdata.new/libzypp-plugin-appdata.changes
       2016-07-15 12:55:12.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Jul 15 07:25:08 UTC 2016 - [email protected]
+
+- InstallAppdata.sh: do not stumble over the presence of the
+  appdata-failed.xml.gz file: this is for debug purpose and does
+  not contain valid applications (boo#989031).
+- Add awk Requires, as the latest modification relies on awk to
+  find the right filenames.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libzypp-plugin-appdata.spec ++++++
--- /var/tmp/diff_new_pack.f7IP0m/_old  2016-07-15 12:55:14.000000000 +0200
+++ /var/tmp/diff_new_pack.f7IP0m/_new  2016-07-15 12:55:14.000000000 +0200
@@ -32,6 +32,8 @@
 Requires:       libzypp >= 14.29.4
 # appstreamcli is provided by the AppStream package
 Requires:       AppStream
+# The script uses awk to find the right filename for the appdata.xml.gz file
+Requires:       awk
 
 %description
 This plugin extends libzypp to install AppStream metadata, as extracted from 
the

++++++ InstallAppdata.sh ++++++
--- /var/tmp/diff_new_pack.f7IP0m/_old  2016-07-15 12:55:14.000000000 +0200
+++ /var/tmp/diff_new_pack.f7IP0m/_new  2016-07-15 12:55:14.000000000 +0200
@@ -43,7 +43,9 @@
     yast2)
       # 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
-        appstream-util install-origin "$2" "$6$YAST2/"appdata*.xml.gz 
"$6$YAST2/"appdata-icons*.tar.gz 2>&1 > /dev/null
+      # get the real appdata.xml.gz file name out of content
+      APPDATA=$(awk '/appdata.*xml.gz/ && !/failed/ {print $4}' "$6/content")
+        appstream-util install-origin "$2" "$6$YAST2/${APPDATA}" 
"$6$YAST2/"appdata-icons*.tar.gz 2>&1 > /dev/null
       #fi
       ;;
     *)


Reply via email to