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

Add flatpak install --or-update operation

Browse Source 
This allows you to ensure that a particular app/runtime is installed
and with the latest version in a single operation, which is useful
for instance in automatic use, like CI systems.
This commit is contained in:
Alexander Larsson
2019-09-26 10:59:09 +02:00
committed by Alexander Larsson
parent 593f0e563b
commit 161a13951b
3 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/flatpak-builtins-install.c
View File

@@ -54,6 +54,7 @@ static gboolean opt_from;
static gboolean opt_yes;
static gboolean opt_reinstall;
static gboolean opt_noninteractive;
static gboolean opt_or_update;
static GOptionEntry options[] = {
{ "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, N_("Arch to install for"), N_("ARCH") },
@@ -71,6 +72,7 @@ static GOptionEntry options[] = {
{ "assumeyes", 'y', 0, G_OPTION_ARG_NONE, &opt_yes, N_("Automatically answer yes for all questions"), NULL },
{ "reinstall", 0, 0, G_OPTION_ARG_NONE, &opt_reinstall, N_("Uninstall first if already installed"), NULL },
{ "noninteractive", 0, 0, G_OPTION_ARG_NONE, &opt_noninteractive, N_("Produce minimal output and don't ask questions"), NULL },
{ "or-update", 0, 0, G_OPTION_ARG_NONE, &opt_or_update, N_("Update install if already installed"), NULL },
{ NULL }
};
@@ -502,13 +504,21 @@ flatpak_builtin_install (int argc, char **argv, GCancellable *cancellable, GErro
if (!flatpak_resolve_matching_refs (remote, dir, opt_yes, refs, id, &ref, error))
return FALSE;
if (!flatpak_transaction_add_install (transaction, remote, ref, (const char **) opt_subpaths, error))
if (!flatpak_transaction_add_install (transaction, remote, ref, (const char **) opt_subpaths, &local_error))
{
if (!g_error_matches (*error, FLATPAK_ERROR, FLATPAK_ERROR_ALREADY_INSTALLED))
return FALSE;
if (!g_error_matches (local_error, FLATPAK_ERROR, FLATPAK_ERROR_ALREADY_INSTALLED))
{
g_propagate_error (error, g_steal_pointer (&local_error));
return FALSE;
}
g_printerr (_("Skipping: %s\n"), (*error)->message);
g_clear_error (error);
if (opt_or_update)
{
if (!flatpak_transaction_add_update (transaction, ref, (const char **) opt_subpaths, NULL, error))
return FALSE;
}
else
g_printerr (_("Skipping: %s\n"), local_error->message);
}
}

8
doc/flatpak-install.xml
View File

@@ -234,6 +234,14 @@
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--or-update</option></term>
<listitem><para>
Normally install just ignores things that are already installed (printing a warning), but if
--or-update is specified it silently turns it into an update operation instead.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--app</option></term>

23
tests/test-run.sh
View File

@@ -24,7 +24,7 @@ set -euo pipefail
skip_without_bwrap
skip_revokefs_without_fuse
echo "1..15"
echo "1..16"
# Use stable rather than master as the branch so we can test that the run
# command automatically finds the branch correctly
@@ -244,6 +244,27 @@ assert_streq "$NEW_COMMIT" "$NEW_NEW_COMMIT"
echo "ok backwards update"
make_updated_app "" "" stable UPDATED2
OLD_COMMIT=`${FLATPAK} ${U} info --show-commit org.test.Hello`
# We should ignore the update (and warn) by default
${FLATPAK} ${U} install -y test-repo org.test.Hello >& install_stderr
NEW_COMMIT=`${FLATPAK} ${U} info --show-commit org.test.Hello`
assert_streq "$OLD_COMMIT" "$NEW_COMMIT"
assert_file_has_content install_stderr 'org.test.Hello/.* is already installed'
# But --or-update should do the update
${FLATPAK} ${U} install -y --or-update test-repo org.test.Hello
NEW_COMMIT=`${FLATPAK} ${U} info --show-commit org.test.Hello`
assert_not_streq "$OLD_COMMIT" "$NEW_COMMIT"
echo "ok install --or-update"
DIR=`mktemp -d`
${FLATPAK} build-init ${DIR} org.test.Split org.test.Platform org.test.Platform stable