Repository navigation
Don't attempt to export metainfo releases.xml files twice - #6698
Conversation
|
Seems fine, thanks. |
c1de527 to
0eee933
Compare
| 'preinstall': {}, | ||
| 'run-custom': {'wrap': ['user', 'system']}, | ||
| 'upgrade-from-header': {'wrap': ['user', 'system', 'system-norevokefs']}, | ||
| 'metainfo-export': {'wrap': ['user', 'system']}, |
There was a problem hiding this comment.
No need to run this in user and system context.
There was a problem hiding this comment.
fwiw, i suggested this because the install path is going through two different FL_DIRs.
There was a problem hiding this comment.
Sure, but we're testing exporting properly in other tests already. This seems to be about building and the exporting mechanism is only used to verify the build result.
There was a problem hiding this comment.
Ok, if there's tests for that already then it's fine. I didn't notice yesterday.
There was a problem hiding this comment.
Alright, took that back out
There was a problem hiding this comment.
Based in a very quick look, it does seem like this is the only test checking that releases.xml are exported when installing though. I added that part of the test to make sure that the fix (and future changes ofc) didn't cause a regression to 1.16's behavior where the build export worked but the install export gave a warning and skipped the file.
There was a problem hiding this comment.
What's important here is that the file ends up in the image at the right location. We already have a test which ensures that those files get exported correctly for user and system installs. If you want to add release.xml to those tests, then go ahead, always appreciated.
Adds a test that verifies releases.xml metainfo files are not duplicated at any export stage, and that they are not left unexported either.
Both collect exports and flatpak_export_dir recursively export the directories in their respective directory lists. Because of this, including share/metainfo/releases when share/metainfo is already in the lists is unnecessary and can cause exporting to fail because of duplicate files.
0eee933 to
77dae6f
Compare
|
Thanks! |
3 participants
Fixes #6695
Removes unnecessary duplicate directories from export steps that would cause errors when trying to export the same file multiple times.
I'm not very familiar with how all the tests are set up, so hopefully I did it right. It seems to work at least.