-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
flaptak-builder: Fix rename with empty id
Signed-off-by: Hubert Figuière <[email protected]>
- Loading branch information
Showing
2 changed files
with
48 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| diff --git a/src/builder-manifest.c b/src/builder-manifest.c | ||
| index 27312714..61d22f14 100644 | ||
| --- a/src/builder-manifest.c | ||
| +++ b/src/builder-manifest.c | ||
| @@ -2806,9 +2806,6 @@ builder_manifest_cleanup (BuilderManifest *self, | ||
| FlatpakXml *n_id; | ||
| FlatpakXml *n_root; | ||
| FlatpakXml *n_text; | ||
| - FlatpakXml *n_provides = NULL; | ||
| - FlatpakXml *n_provides_id = NULL; | ||
| - FlatpakXml *id_text = NULL; | ||
| g_autofree char *old_id = NULL; | ||
| g_autoptr(FlatpakXml) xml_root = NULL; | ||
| g_autoptr(GInputStream) in = NULL; | ||
| @@ -2841,16 +2838,23 @@ builder_manifest_cleanup (BuilderManifest *self, | ||
| } | ||
| } | ||
|
|
||
| - n_provides = flatpak_xml_find (n_root, "provides", NULL); | ||
| - if (!n_provides) | ||
| + if (old_id) | ||
| { | ||
| - n_provides = flatpak_xml_new ("provides"); | ||
| - flatpak_xml_add (n_root, n_provides); | ||
| + FlatpakXml *n_provides = NULL; | ||
| + FlatpakXml *n_provides_id = NULL; | ||
| + FlatpakXml *id_text = NULL; | ||
| + | ||
| + n_provides = flatpak_xml_find (n_root, "provides", NULL); | ||
| + if (!n_provides) | ||
| + { | ||
| + n_provides = flatpak_xml_new ("provides"); | ||
| + flatpak_xml_add (n_root, n_provides); | ||
| + } | ||
| + n_provides_id = flatpak_xml_new ("id"); | ||
| + id_text = flatpak_xml_new_text (g_steal_pointer (&old_id)); | ||
| + flatpak_xml_add (n_provides_id, id_text); | ||
| + flatpak_xml_add (n_provides, n_provides_id); | ||
| } | ||
| - n_provides_id = flatpak_xml_new ("id"); | ||
| - id_text = flatpak_xml_new_text (g_steal_pointer (&old_id)); | ||
| - flatpak_xml_add (n_provides_id, id_text); | ||
| - flatpak_xml_add (n_provides, n_provides_id); | ||
|
|
||
| /* replace any optional launchable */ | ||
| n_id = flatpak_xml_find (n_root, "launchable", NULL); |