creating extra appdata-icons.xml.gz for SLE15+ (issue #8259) #8379
Conversation
|
@doccaz, thanks for your contribution 💐 |
|
Just found out that the extra *-appdata-icons.tar.gz file I created is NOT being deleted by the publisher when it updates the repository. So I now have a couple extra appdata-icons files in the directory... Trying to find where I missed it in the code. |
src/backend/bs_publish
Outdated
| @@ -658,7 +658,11 @@ sub createrepo_rpmmd { | |||
| if (-e "$extrep/repodata/app-icons.tar") { | |||
| print " adding app-icons.tar to repodata\n"; | |||
| qsystem($modifyrepo_bin, "$extrep/repodata/app-icons.tar", "$extrep/repodata", @legacyargs) && die(" modifyrepo failed: $?\n"); | |||
| unlink("$extrep/repodata/app-icons.tar"); | |||
| qsystem("mv $extrep/repodata/app-icons.tar $extrep/repodata/appdata-icons.tar") && die(" copy appdata-icons failed: $?\n"); | |||
There was a problem hiding this comment.
You shouldn't call qsystem() with "mv xxx yyy" as one string, instead you should use 'mv', 'xxx', 'yyy'.
But in this specific case you shouldn't call qsystem() at all; just use perl's rename() function.
There was a problem hiding this comment.
Done. Sorry for the (huge) delay. Too much happening at the same time.
|
can you squash the two commits into one? Will merge right afterwards :) |
Codecov Report
@@ Coverage Diff @@
## master #8379 +/- ##
==========================================
+ Coverage 90.86% 90.89% +0.02%
==========================================
Files 496 496
Lines 21022 21022
==========================================
+ Hits 19101 19107 +6
+ Misses 1921 1915 -6 |
|
I have manualy cherry-picked now to avoid the additional merge commit. thanks! |
Here is my proposed patch to work around the app-icons vs appdata-icons issue with SLE15+. The effect is minimal (only another file published with the same contents as app-icons.xml.gz). These files are usually small, and will allow for the repositories to be used with GNOME Software on both SLE12/Leap 42.3 and Leap 15/SLE15+.