is a Linux application sandboxing and distribution framework. Pre-release.
| flatpak-builtins-build-commit-from.c (flatpak-1.15.1.tar.xz) | : | flatpak-builtins-build-commit-from.c (flatpak-1.15.2.tar.xz) |
|---|
| | |
| skipping to change at line 132 | | skipping to change at line 132 |
|---|
| g_string_append (ret, target); | | g_string_append (ret, target); |
| } | | } |
| | |
| return g_string_free (ret, FALSE); | | return g_string_free (ret, FALSE); |
| } | | } |
| | |
| static GVariant * | | static GVariant * |
| new_bytearray (const guchar *data, | | new_bytearray (const guchar *data, |
| gsize len) | | gsize len) |
| { | | { |
|
| gpointer data_copy = g_memdup (data, len); | | gpointer data_copy = g_memdup2 (data, len); |
| GVariant *ret = g_variant_new_from_data (G_VARIANT_TYPE ("ay"), data_copy, | | GVariant *ret = g_variant_new_from_data (G_VARIANT_TYPE ("ay"), data_copy, |
| len, FALSE, g_free, data_copy); | | len, FALSE, g_free, data_copy); |
| | |
| return ret; | | return ret; |
| } | | } |
| | |
| static gboolean | | static gboolean |
| rewrite_delta (OstreeRepo *src_repo, | | rewrite_delta (OstreeRepo *src_repo, |
| const char *src_commit, | | const char *src_commit, |
| OstreeRepo *dst_repo, | | OstreeRepo *dst_repo, |
| | |
| skipping to change at line 721 | | skipping to change at line 721 |
|---|
| gsize n_from = 0; | | gsize n_from = 0; |
| | |
| if (dst_parent != NULL) | | if (dst_parent != NULL) |
| from[n_from++] = dst_parent; | | from[n_from++] = dst_parent; |
| from[n_from++] = NULL; | | from[n_from++] = NULL; |
| | |
| for (j = 0; j < n_from; j++) | | for (j = 0; j < n_from; j++) |
| { | | { |
| g_autoptr(GError) local_error = NULL; | | g_autoptr(GError) local_error = NULL; |
| if (!rewrite_delta (src_repo, resolved_ref, dst_repo, commit_checksu
m, dst_commitv, from[j], &local_error)) | | if (!rewrite_delta (src_repo, resolved_ref, dst_repo, commit_checksu
m, dst_commitv, from[j], &local_error)) |
|
| g_debug ("Failed to copy delta: %s", local_error->message); | | g_info ("Failed to copy delta: %s", local_error->message); |
| } | | } |
| } | | } |
| } | | } |
| | |
| if (!ostree_repo_commit_transaction (dst_repo, NULL, cancellable, error)) | | if (!ostree_repo_commit_transaction (dst_repo, NULL, cancellable, error)) |
| return FALSE; | | return FALSE; |
| | |
| if (opt_update_appstream && | | if (opt_update_appstream && |
| !flatpak_repo_generate_appstream (dst_repo, (const char **) opt_gpg_key_id
s, opt_gpg_homedir, 0, cancellable, error)) | | !flatpak_repo_generate_appstream (dst_repo, (const char **) opt_gpg_key_id
s, opt_gpg_homedir, 0, cancellable, error)) |
| return FALSE; | | return FALSE; |
| | |
| if (!opt_no_update_summary) | | if (!opt_no_update_summary) |
| { | | { |
| FlatpakRepoUpdateFlags flags = FLATPAK_REPO_UPDATE_FLAG_NONE; | | FlatpakRepoUpdateFlags flags = FLATPAK_REPO_UPDATE_FLAG_NONE; |
| | |
| if (opt_no_summary_index) | | if (opt_no_summary_index) |
| flags |= FLATPAK_REPO_UPDATE_FLAG_DISABLE_INDEX; | | flags |= FLATPAK_REPO_UPDATE_FLAG_DISABLE_INDEX; |
| | |
|
| g_debug ("Updating summary"); | | g_info ("Updating summary"); |
| if (!flatpak_repo_update (dst_repo, flags, | | if (!flatpak_repo_update (dst_repo, flags, |
| (const char **) opt_gpg_key_ids, | | (const char **) opt_gpg_key_ids, |
| opt_gpg_homedir, | | opt_gpg_homedir, |
| cancellable, | | cancellable, |
| error)) | | error)) |
| return FALSE; | | return FALSE; |
| } | | } |
| | |
| return TRUE; | | return TRUE; |
| } | | } |
| | | |
| End of changes. 3 change blocks. |
|---|
| 3 lines changed or deleted | | 3 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 