diff options
| author | Alexander Larsson <alexl@redhat.com> | 2017-12-13 12:10:58 +0100 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-12-14 08:20:34 +0000 |
| commit | 4e9c0310053b404711cc0edcd3aef6bab920441f (patch) | |
| tree | 388b15d0b782a1ec28ce2e64ea78e47cc7d10ff9 | |
| parent | 62df4e083f43f48172d1f540cd9ebee86dbf587c (diff) | |
| download | flatpak-4e9c0310053b404711cc0edcd3aef6bab920441f.tar.gz | |
update: Add information on wheter updates are per-user
Now that flatpak update does both per-user and systemwide
per default it makes a lot of sense to say which one is being
updated.
Closes: #1248
Approved by: alexlarsson
| -rw-r--r-- | app/flatpak-builtins-update.c | 5 | ||||
| -rw-r--r-- | app/flatpak-transaction.c | 17 |
2 files changed, 17 insertions, 5 deletions
diff --git a/app/flatpak-builtins-update.c b/app/flatpak-builtins-update.c index 0060c0ad..fe73d955 100644 --- a/app/flatpak-builtins-update.c +++ b/app/flatpak-builtins-update.c @@ -103,7 +103,10 @@ update_appstream (GPtrArray *dirs, const char *remote, GCancellable *cancellable !flatpak_dir_check_for_appstream_update (dir, remotes[i], opt_arch)) continue; - g_print (_("Updating appstream data for remote %s\n"), remotes[i]); + if (flatpak_dir_is_user (dir)) + g_print (_("Updating appstream data for user remote %s\n"), remotes[i]); + else + g_print (_("Updating appstream data for remote %s\n"), remotes[i]); progress = ostree_async_progress_new_and_connect (no_progress_cb, NULL); if (!flatpak_dir_update_appstream (dir, remotes[i], opt_arch, &changed, progress, cancellable, &local_error)) diff --git a/app/flatpak-transaction.c b/app/flatpak-transaction.c index 458b6b67..080fc792 100644 --- a/app/flatpak-transaction.c +++ b/app/flatpak-transaction.c @@ -696,8 +696,11 @@ flatpak_transaction_run (FlatpakTransaction *self, { g_autoptr(OstreeAsyncProgress) progress = flatpak_progress_new (flatpak_terminal_progress_cb, &terminal_progress); opname = _("install"); - g_print (_("Installing: %s from %s\n"), pref, op->remote); - res = flatpak_dir_install (self->dir, + if (flatpak_dir_is_user (self->dir)) + g_print (_("Installing for user: %s from %s\n"), pref, op->remote); + else + g_print (_("Installing: %s from %s\n"), pref, op->remote); + res = flatpak_dir_install (self->dir , self->no_pull, self->no_deploy, self->no_static_deltas, @@ -720,7 +723,10 @@ flatpak_transaction_run (FlatpakTransaction *self, cancellable, &local_error); if (target_commit != NULL) { - g_print (_("Updating: %s from %s\n"), pref, op->remote); + if (flatpak_dir_is_user (self->dir)) + g_print (_("Updating for user: %s from %s\n"), pref, op->remote); + else + g_print (_("Updating: %s from %s\n"), pref, op->remote); g_autoptr(OstreeAsyncProgress) progress = flatpak_progress_new (flatpak_terminal_progress_cb, &terminal_progress); res = flatpak_dir_update (self->dir, self->no_pull, @@ -765,7 +771,10 @@ flatpak_transaction_run (FlatpakTransaction *self, { g_autofree char *bundle_basename = g_file_get_basename (op->bundle); opname = _("install bundle"); - g_print (_("Installing: %s from bundle %s\n"), pref, bundle_basename); + if (flatpak_dir_is_user (self->dir)) + g_print (_("Installing for user: %s from bundle %s\n"), pref, bundle_basename); + else + g_print (_("Installing: %s from bundle %s\n"), pref, bundle_basename); res = flatpak_dir_install_bundle (self->dir, op->bundle, op->remote, NULL, cancellable, &local_error); |