mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-04 15:15:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

app: Use g_info() for messages that will be shown by flatpak -v

Browse Source 
This brings us one step closer to being able to stop using the flatpak2
log domain for messages that are exclusive to `flatpak -v -v`.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie
2022-12-14 15:07:25 +00:00
committed by Simon McVittie
parent 07a6541f06
commit 522a933bc9
13 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/flatpak-builtins-build-commit-from.c
View File

@@ -719,7 +719,7 @@ flatpak_builtin_build_commit_from (int argc, char **argv, GCancellable *cancella
{
g_autoptr(GError) local_error = NULL;
if (!rewrite_delta (src_repo, resolved_ref, dst_repo, commit_checksum, 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);
}
}
}
@@ -738,7 +738,7 @@ flatpak_builtin_build_commit_from (int argc, char **argv, GCancellable *cancella
if (opt_no_summary_index)
flags |= FLATPAK_REPO_UPDATE_FLAG_DISABLE_INDEX;
g_debug ("Updating summary");
g_info ("Updating summary");
if (!flatpak_repo_update (dst_repo, flags,
(const char **) opt_gpg_key_ids,
opt_gpg_homedir,

8
app/flatpak-builtins-build-export.c
View File

@@ -208,7 +208,7 @@ commit_filter (OstreeRepo *repo,
if (matches_patterns (commit_data->exclude, path) &&
!matches_patterns (commit_data->include, path))
{
g_debug ("Excluding %s", path);
g_info ("Excluding %s", path);
return OSTREE_REPO_COMMIT_FILTER_SKIP;
}
@@ -395,13 +395,13 @@ validate_icon_file (GFile *file, GError **error)
G_SPAWN_STDOUT_TO_DEV_NULL,
NULL, NULL, NULL, &err, &status, error))
{
g_debug ("Icon validation: %s", (*error)->message);
g_info ("Icon validation: %s", (*error)->message);
return FALSE;
}
if (!g_spawn_check_exit_status (status, NULL))
{
g_debug ("Icon validation: %s", err);
g_info ("Icon validation: %s", err);
return flatpak_fail (error, "%s is not a valid icon: %s", name, err);
}
@@ -1151,7 +1151,7 @@ flatpak_builtin_build_export (int argc, char **argv, GCancellable *cancellable,
if (opt_no_summary_index)
flags |= FLATPAK_REPO_UPDATE_FLAG_DISABLE_INDEX;
g_debug ("Updating summary");
g_info ("Updating summary");
if (!flatpak_repo_update (repo, flags,
(const char **) opt_gpg_key_ids,
opt_gpg_homedir,

18
app/flatpak-builtins-build-finish.c
View File

@@ -175,7 +175,7 @@ export_dir (int source_parent_fd,
else
{
source_printable = g_build_filename (source_relpath, dent->d_name, NULL);
g_debug ("Not exporting non-regular file %s", source_printable);
g_info ("Not exporting non-regular file %s", source_printable);
}
}
@@ -265,7 +265,7 @@ collect_exports (GFile *base,
if (g_file_query_exists (src, cancellable))
{
g_debug ("Exporting from %s", path);
g_info ("Exporting from %s", path);
g_autoptr(GFile) dest = NULL;
g_autoptr(GFile) dest_parent = NULL;
@@ -275,10 +275,10 @@ collect_exports (GFile *base,
dest = g_file_resolve_relative_path (export, path);
dest_parent = g_file_get_parent (dest);
g_debug ("Ensuring export/%s parent exists", path);
g_info ("Ensuring export/%s parent exists", path);
if (!flatpak_mkdir_p (dest_parent, cancellable, error))
return FALSE;
g_debug ("Copying from files/%s", path);
g_info ("Copying from files/%s", path);
if (!copy_exports (src,
dest,
path,
@@ -401,14 +401,14 @@ update_metadata (GFile *base, FlatpakContext *arg_context, gboolean is_runtime,
{
if (g_key_file_has_key (keyfile, group, FLATPAK_METADATA_KEY_COMMAND, NULL))
{
g_debug ("Command key is present");
g_info ("Command key is present");
if (opt_command)
g_key_file_set_string (keyfile, group, FLATPAK_METADATA_KEY_COMMAND, opt_command);
}
else if (opt_command)
{
g_debug ("Using explicitly provided command %s", opt_command);
g_info ("Using explicitly provided command %s", opt_command);
g_key_file_set_string (keyfile, group, FLATPAK_METADATA_KEY_COMMAND, opt_command);
}
@@ -419,7 +419,7 @@ update_metadata (GFile *base, FlatpakContext *arg_context, gboolean is_runtime,
g_autoptr(GFileEnumerator) bin_enum = NULL;
g_autoptr(GFileInfo) child_info = NULL;
g_debug ("Looking for executables");
g_info ("Looking for executables");
bin_dir = g_file_resolve_relative_path (base, "files/bin");
if (g_file_query_exists (bin_dir, cancellable))
@@ -687,12 +687,12 @@ flatpak_builtin_build_finish (int argc, char **argv, GCancellable *cancellable,
if (!is_runtime)
{
g_debug ("Collecting exports");
g_info ("Collecting exports");
if (!collect_exports (base, id, arg_context, cancellable, error))
return FALSE;
}
g_debug ("Updating metadata");
g_info ("Updating metadata");
if (!update_metadata (base, arg_context, is_runtime, cancellable, error))
return FALSE;

2
app/flatpak-builtins-build-import-bundle.c
View File

@@ -248,7 +248,7 @@ flatpak_builtin_build_import (int argc, char **argv, GCancellable *cancellable,
if (opt_no_summary_index)
flags |= FLATPAK_REPO_UPDATE_FLAG_DISABLE_INDEX;
g_debug ("Updating summary");
g_info ("Updating summary");
if (!flatpak_repo_update (repo, flags,
(const char **) opt_gpg_key_ids,
opt_gpg_homedir,

2
app/flatpak-builtins-build-update-repo.c
View File

@@ -400,7 +400,7 @@ generate_all_deltas (OstreeRepo *repo,
if (ignore_ref)
{
g_debug ("Ignoring deltas for ref %s", ref);
g_info ("Ignoring deltas for ref %s", ref);
continue;
}

10
app/flatpak-builtins-create-usb.c
View File

@@ -111,7 +111,7 @@ add_related (GHashTable *all_refs,
g_autofree char *branch = NULL;
GList *extensions, *l;
g_debug ("Finding related refs for ‘%s’", flatpak_decomposed_get_ref (ref));
g_info ("Finding related refs for ‘%s’", flatpak_decomposed_get_ref (ref));
arch = flatpak_decomposed_dup_arch (ref);
branch = flatpak_decomposed_dup_branch (ref);
@@ -228,7 +228,7 @@ add_runtime (GHashTable *all_refs,
CommitAndSubpaths *c_s;
g_autoptr(GVariant) extra_data_sources = NULL;
g_debug ("Finding the runtime for ‘%s’", flatpak_decomposed_get_ref (ref));
g_info ("Finding the runtime for ‘%s’", flatpak_decomposed_get_ref (ref));
deploy_data = flatpak_dir_get_deploy_data (dir, ref, FLATPAK_DEPLOY_VERSION_ANY, cancellable, error);
if (deploy_data == NULL)
@@ -316,7 +316,7 @@ ostree_create_usb (GOptionContext *context,
* more performant than bare-user */
OstreeRepoMode mode = OSTREE_REPO_MODE_ARCHIVE;
g_debug ("%s: Creating repository in mode %u", G_STRFUNC, mode);
g_info ("%s: Creating repository in mode %u", G_STRFUNC, mode);
g_autoptr(OstreeRepo) dest_repo = ostree_repo_create_at (mount_root_dfd, dest_repo_path,
mode, NULL, cancellable, error);
@@ -785,7 +785,7 @@ flatpak_builtin_create_usb (int argc, char **argv, GCancellable *cancellable, GE
else
{
/* Appstream2 is only for efficiency, so just print a debug message */
g_debug (_("Couldn't find appstream2 data for remote ‘%s’ arch ‘%s’: %s\n"),
g_info (_("Couldn't find appstream2 data for remote ‘%s’ arch ‘%s’: %s\n"),
remote_name, current_arch, appstream2_error->message);
}
}
@@ -814,7 +814,7 @@ flatpak_builtin_create_usb (int argc, char **argv, GCancellable *cancellable, GE
g_string_append_printf (all_refs_str, "(%s, %s) ", collection_ref->collection_id, collection_ref->ref_name);
}
g_debug ("Copying the following refs: %s", all_refs_str->str);
g_info ("Copying the following refs: %s", all_refs_str->str);
if (!ostree_create_usb (context, src_repo, mount_root_path, mount_root_stbuf,
mount_root_dfd, all_refs, cancellable, error))

2
app/flatpak-builtins-kill.c
View File

@@ -62,7 +62,7 @@ kill_instance (const char *id,
}
}
g_debug ("Killed %d instances", killed);
g_info ("Killed %d instances", killed);
if (killed == 0)
return flatpak_fail (error, _("%s is not running"), id);

2
app/flatpak-builtins-ps.c
View File

@@ -108,7 +108,7 @@ get_compositor_apps (void)
if (ret)
g_variant_get (ret, "(@a{sv})", &list);
else
g_debug ("Failed to get information about running apps from background portal backends");
g_info ("Failed to get information about running apps from background portal backends");
return list;
}

4
app/flatpak-builtins-search.c
View File

@@ -285,8 +285,8 @@ flatpak_builtin_search (int argc, char **argv, GCancellable *cancellable, GError
if (bundle == NULL || as_bundle_get_id (bundle) == NULL ||
(decomposed = flatpak_decomposed_new_from_ref (as_bundle_get_id (bundle), NULL)) == NULL)
{
g_debug ("Ignoring app %s from remote %s as it lacks a flatpak bundle",
as_component_get_id (app), remote_name);
g_info ("Ignoring app %s from remote %s as it lacks a flatpak bundle",
as_component_get_id (app), remote_name);
continue;
}

8
app/flatpak-builtins-uninstall.c
View File

@@ -180,8 +180,8 @@ confirm_runtime_removal (gboolean yes_opt,
&udir->extension_app_map,
ref, NULL, &local_error);
if (apps == NULL)
g_debug ("Unable to list apps using extension %s: %s\n",
flatpak_decomposed_get_ref (ref), local_error->message);
g_info ("Unable to list apps using extension %s: %s\n",
flatpak_decomposed_get_ref (ref), local_error->message);
}
else
{
@@ -189,8 +189,8 @@ confirm_runtime_removal (gboolean yes_opt,
&udir->runtime_app_map,
ref, NULL, &local_error);
if (apps == NULL)
g_debug ("Unable to list apps using runtime %s: %s\n",
flatpak_decomposed_get_ref (ref), local_error->message);
g_info ("Unable to list apps using runtime %s: %s\n",
flatpak_decomposed_get_ref (ref), local_error->message);
}
if (apps == NULL || apps->len == 0)

14
app/flatpak-builtins-utils.c
View File

@@ -677,11 +677,11 @@ update_appstream (GPtrArray *dirs,
ts_file_age = get_appstream_timestamp (dir, remotes[i], arch);
if (ts_file_age < ttl)
{
g_debug ("%s:%s appstream age %" G_GUINT64_FORMAT " is less than ttl %" G_GUINT64_FORMAT, remotes[i], arch, ts_file_age, ttl);
g_info ("%s:%s appstream age %" G_GUINT64_FORMAT " is less than ttl %" G_GUINT64_FORMAT, remotes[i], arch, ts_file_age, ttl);
continue;
}
else
g_debug ("%s:%s appstream age %" G_GUINT64_FORMAT " is greater than ttl %" G_GUINT64_FORMAT, remotes[i], arch, ts_file_age, ttl);
g_info ("%s:%s appstream age %" G_GUINT64_FORMAT " is greater than ttl %" G_GUINT64_FORMAT, remotes[i], arch, ts_file_age, ttl);
if (flatpak_dir_get_remote_disabled (dir, remotes[i]) ||
flatpak_dir_get_remote_noenumerate (dir, remotes[i]))
@@ -690,7 +690,7 @@ update_appstream (GPtrArray *dirs,
if (flatpak_dir_is_user (dir))
{
if (quiet)
g_debug (_("Updating appstream data for user remote %s"), remotes[i]);
g_info (_("Updating appstream data for user remote %s"), remotes[i]);
else
{
g_print (_("Updating appstream data for user remote %s"), remotes[i]);
@@ -700,7 +700,7 @@ update_appstream (GPtrArray *dirs,
else
{
if (quiet)
g_debug (_("Updating appstream data for remote %s"), remotes[i]);
g_info (_("Updating appstream data for remote %s"), remotes[i]);
else
{
g_print (_("Updating appstream data for remote %s"), remotes[i]);
@@ -711,7 +711,7 @@ update_appstream (GPtrArray *dirs,
NULL, cancellable, &local_error))
{
if (quiet)
g_debug ("%s: %s", _("Error updating"), local_error->message);
g_info ("%s: %s", _("Error updating"), local_error->message);
else
g_printerr ("%s: %s\n", _("Error updating"), local_error->message);
}
@@ -735,11 +735,11 @@ update_appstream (GPtrArray *dirs,
ts_file_age = get_appstream_timestamp (dir, remote, arch);
if (ts_file_age < ttl)
{
g_debug ("%s:%s appstream age %" G_GUINT64_FORMAT " is less than ttl %" G_GUINT64_FORMAT, remote, arch, ts_file_age, ttl);
g_info ("%s:%s appstream age %" G_GUINT64_FORMAT " is less than ttl %" G_GUINT64_FORMAT, remote, arch, ts_file_age, ttl);
continue;
}
else
g_debug ("%s:%s appstream age %" G_GUINT64_FORMAT " is greater than ttl %" G_GUINT64_FORMAT, remote, arch, ts_file_age, ttl);
g_info ("%s:%s appstream age %" G_GUINT64_FORMAT " is greater than ttl %" G_GUINT64_FORMAT, remote, arch, ts_file_age, ttl);
if (!flatpak_dir_update_appstream (dir, remote, arch, &changed,
NULL, cancellable, error))

10
app/flatpak-cli-transaction.c
View File

@@ -841,8 +841,8 @@ find_reverse_dep_apps (FlatpakTransaction *transaction,
ref, NULL, &local_error);
if (apps == NULL)
{
g_debug ("Unable to list apps using extension %s: %s\n",
flatpak_decomposed_get_ref (ref), local_error->message);
g_info ("Unable to list apps using extension %s: %s\n",
flatpak_decomposed_get_ref (ref), local_error->message);
return NULL;
}
}
@@ -853,8 +853,8 @@ find_reverse_dep_apps (FlatpakTransaction *transaction,
NULL, &local_error);
if (apps == NULL)
{
g_debug ("Unable to find apps using runtime %s: %s\n",
flatpak_decomposed_get_ref (ref), local_error->message);
g_info ("Unable to find apps using runtime %s: %s\n",
flatpak_decomposed_get_ref (ref), local_error->message);
return NULL;
}
}
@@ -975,7 +975,7 @@ end_of_lifed_with_rebase (FlatpakTransaction *transaction,
}
else
{
g_debug ("%s is end-of-life, using action from parent ref", name);
g_info ("%s is end-of-life, using action from parent ref", name);
}
/* Cache for later comparison and reuse */

6
app/flatpak-main.c
View File

@@ -611,7 +611,7 @@ install_polkit_agent (void)
if (bus == NULL)
{
g_debug ("Unable to connect to system bus: %s", local_error->message);
g_info ("Unable to connect to system bus: %s", local_error->message);
return NULL;
}
@@ -619,7 +619,7 @@ install_polkit_agent (void)
listener = flatpak_polkit_agent_text_listener_new (NULL, &local_error);
if (listener == NULL)
{
g_debug ("Failed to create polkit agent listener: %s", local_error->message);
g_info ("Failed to create polkit agent listener: %s", local_error->message);
}
else
{
@@ -643,7 +643,7 @@ install_polkit_agent (void)
&local_error);
if (agent == NULL)
{
g_debug ("Failed to register polkit agent listener: %s", local_error->message);
g_info ("Failed to register polkit agent listener: %s", local_error->message);
}
g_object_unref (listener);
}