keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

deploy: use consistent argument names

Browse Source 
This is just a cosmetic patch that ensures we use the same names for the
same things everywhere to make it easier to follow along.

Closes: #829
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2017-06-12 16:28:42 -04:00 committed by Atomic Bot
parent 9907f9b283
commit 4a61e55663
3 changed files with 69 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/daemon/rpmostreed-os.c
View File

@ -402,15 +402,15 @@ start_deployment_txn (GDBusMethodInvocation *invocation,
const char *revision,
RpmOstreeTransactionDeployFlags default_flags,
GVariant *options,
const char *const *pkgs_to_add,
const char *const *pkgs_to_remove,
GVariant *local_pkgs_to_add,
const char *const *install_pkgs,
GVariant *install_local_pkgs_idxs,
const char *const *uninstall_pkgs,
const char *const *override_replace_pkgs,
GVariant *override_replace_local_pkgs,
GVariant *override_replace_local_pkgs_idxs,
const char *const *override_remove_pkgs,
const char *const *override_reset_pkgs,
GUnixFDList *fd_list,
GError **error)
GError **error)
{
glnx_unref_object OstreeSysroot *ot_sysroot = NULL;
g_autoptr(GCancellable) cancellable = g_cancellable_new ();
@ -427,8 +427,8 @@ start_deployment_txn (GDBusMethodInvocation *invocation,
* the same length. */
guint expected_fdn = 0;
if (local_pkgs_to_add)
expected_fdn = g_variant_n_children (local_pkgs_to_add);
if (install_local_pkgs_idxs)
expected_fdn = g_variant_n_children (install_local_pkgs_idxs);
guint actual_fdn = 0;
if (fd_list)
@ -449,12 +449,12 @@ start_deployment_txn (GDBusMethodInvocation *invocation,
"new refspec or revision");
/* NB: remove HIDDEN attribute on "replace" cmdline once we implement this */
if (override_replace_pkgs || override_replace_local_pkgs)
if (override_replace_pkgs || override_replace_local_pkgs_idxs)
return glnx_null_throw (error, "Replacement overrides not implemented yet");
if (vardict_lookup_bool (&options_dict, "no-overrides", FALSE) &&
(override_remove_pkgs || override_reset_pkgs ||
override_replace_pkgs || override_replace_local_pkgs))
override_replace_pkgs || override_replace_local_pkgs_idxs))
return glnx_null_throw (error, "Can't specify no-overrides if setting "
"override modifiers");
@ -469,9 +469,9 @@ start_deployment_txn (GDBusMethodInvocation *invocation,
osname,
refspec,
revision,
pkgs_to_add,
pkgs_to_remove,
install_pkgs,
fd_list,
uninstall_pkgs,
override_remove_pkgs,
override_reset_pkgs,
cancellable, error);
@ -489,11 +489,11 @@ os_merge_or_start_deployment_txn (RPMOSTreeOS *interface,
const char *revision,
RpmOstreeTransactionDeployFlags default_flags,
GVariant *options,
const char *const *pkgs_to_add,
const char *const *pkgs_to_remove,
GVariant *local_pkgs_to_add,
const char *const *install_pkgs,
const char *const *uninstall_pkgs,
GVariant *install_local_pkgs_idxs,
const char *const *override_replace_pkgs,
GVariant *override_replace_local_pkgs,
GVariant *override_replace_local_pkgs_idxs,
const char *const *override_remove_pkgs,
const char *const *override_reset_pkgs,
GUnixFDList *fd_list,
@ -510,11 +510,12 @@ os_merge_or_start_deployment_txn (RPMOSTreeOS *interface,
{
transaction = start_deployment_txn (invocation,
rpmostree_os_get_name (interface),
refspec, revision, default_flags,
options, pkgs_to_add, pkgs_to_remove,
local_pkgs_to_add,
refspec, revision, default_flags, options,
install_pkgs,
install_local_pkgs_idxs,
uninstall_pkgs,
override_replace_pkgs,
override_replace_local_pkgs,
override_replace_local_pkgs_idxs,
override_remove_pkgs,
override_reset_pkgs,
fd_list,
@ -673,10 +674,10 @@ os_handle_update_deployment (RPMOSTreeOS *interface,
vardict_lookup_ptr (&dict, "override-remove-packages", "^a&s");
g_autofree const char *const *override_reset_pkgs =
vardict_lookup_ptr (&dict, "override-reset-packages", "^a&s");
g_autoptr(GVariant) install_local_pkgs =
g_autoptr(GVariant) install_local_pkgs_idxs =
g_variant_dict_lookup_value (&dict, "install-local-packages",
G_VARIANT_TYPE("ah"));
g_autoptr(GVariant) override_replace_local_pkgs =
g_autoptr(GVariant) override_replace_local_pkgs_idxs =
g_variant_dict_lookup_value (&dict, "override-replace-local-packages",
G_VARIANT_TYPE("ah"));
@ -689,9 +690,9 @@ os_handle_update_deployment (RPMOSTreeOS *interface,
arg_options,
install_pkgs,
uninstall_pkgs,
install_local_pkgs,
install_local_pkgs_idxs,
override_replace_pkgs,
override_replace_local_pkgs,
override_replace_local_pkgs_idxs,
override_remove_pkgs,
override_reset_pkgs,
fd_list,

82
src/daemon/rpmostreed-transaction-types.c
View File

@ -415,14 +415,14 @@ rpmostreed_transaction_new_rollback (GDBusMethodInvocation *invocation,
typedef struct {
RpmostreedTransaction parent;
RpmOstreeTransactionDeployFlags flags;
char *osname;
char *refspec; /* NULL for non-rebases */
char *revision; /* NULL for upgrade */
char **packages_added;
char **packages_removed;
char **override_remove_packages;
char **override_reset_packages;
GUnixFDList *local_packages_added;
char *osname;
char *refspec; /* NULL for non-rebases */
char *revision; /* NULL for upgrade */
char **install_pkgs;
GUnixFDList *install_local_pkgs;
char **uninstall_pkgs;
char **override_remove_pkgs;
char **override_reset_pkgs;
} DeployTransaction;
typedef RpmostreedTransactionClass DeployTransactionClass;
@ -442,11 +442,11 @@ deploy_transaction_finalize (GObject *object)
g_free (self->osname);
g_free (self->refspec);
g_free (self->revision);
g_strfreev (self->packages_added);
g_strfreev (self->packages_removed);
g_strfreev (self->override_remove_packages);
g_strfreev (self->override_reset_packages);
g_clear_pointer (&self->local_packages_added, g_object_unref);
g_strfreev (self->install_pkgs);
g_clear_pointer (&self->install_local_pkgs, g_object_unref);
g_strfreev (self->uninstall_pkgs);
g_strfreev (self->override_remove_pkgs);
g_strfreev (self->override_reset_pkgs);
G_OBJECT_CLASS (deploy_transaction_parent_class)->finalize (object);
}
@ -520,8 +520,8 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
/* this should have been checked already */
if (no_overrides)
{
g_assert (self->override_remove_packages == NULL);
g_assert (self->override_reset_packages == NULL);
g_assert (self->override_remove_pkgs == NULL);
g_assert (self->override_reset_pkgs == NULL);
}
if (self->refspec)
@ -578,8 +578,8 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
{
/* this is a heuristic; by the end, once the proper switches are added, the two
* commands can look indistinguishable at the D-Bus level */
is_override = (self->override_reset_packages ||
self->override_remove_packages ||
is_override = (self->override_reset_pkgs ||
self->override_remove_pkgs ||
no_overrides);
is_install = !is_override;
}
@ -598,9 +598,9 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
g_string_append (txn_title, "upgrade");
gboolean changed = FALSE;
if (self->packages_removed)
if (self->uninstall_pkgs)
{
if (!rpmostree_origin_remove_packages (origin, self->packages_removed, error))
if (!rpmostree_origin_remove_packages (origin, self->uninstall_pkgs, error))
return FALSE;
/* in reality, there may not be any new layer required (if e.g. we're
@ -610,12 +610,12 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
changed = TRUE;
g_string_append_printf (txn_title, "; uninstall: %u",
g_strv_length (self->packages_removed));
g_strv_length (self->uninstall_pkgs));
}
if (self->packages_added)
if (self->install_pkgs)
{
if (!rpmostree_origin_add_packages (origin, self->packages_added, FALSE, error))
if (!rpmostree_origin_add_packages (origin, self->install_pkgs, FALSE, error))
return FALSE;
/* here too -- we could optimize this under certain conditions
@ -623,10 +623,10 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
changed = TRUE;
g_string_append_printf (txn_title, "; install: %u",
g_strv_length (self->packages_added));
g_strv_length (self->install_pkgs));
}
if (self->local_packages_added != NULL)
if (self->install_local_pkgs != NULL)
{
/* add them all to an array first to make the origin
* update more efficient */
@ -634,7 +634,7 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
gint nfds = 0;
const gint *fds =
g_unix_fd_list_peek_fds (self->local_packages_added, &nfds);
g_unix_fd_list_peek_fds (self->install_local_pkgs, &nfds);
for (guint i = 0; i < nfds; i++)
{
g_autofree char *sha256_nevra = NULL;
@ -666,9 +666,9 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
changed = changed || overrides_changed;
}
else if (self->override_reset_packages)
else if (self->override_reset_pkgs)
{
if (!rpmostree_origin_remove_overrides (origin, self->override_reset_packages, error))
if (!rpmostree_origin_remove_overrides (origin, self->override_reset_pkgs, error))
return FALSE;
changed = TRUE;
@ -696,7 +696,7 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
* anyway in the common case even if there's an error with the overrides,
* users will fix it and try again, so the second pull will be a no-op */
if (self->override_remove_packages)
if (self->override_remove_pkgs)
{
const char *base = rpmostree_sysroot_upgrader_get_base (upgrader);
g_autoptr(RpmOstreeRefSack) rsack =
@ -706,7 +706,7 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
/* NB: the strings are owned by the sack pool */
g_autoptr(GPtrArray) pkgnames = g_ptr_array_new ();
for (char **it = self->override_remove_packages; it && *it; it++)
for (char **it = self->override_remove_pkgs; it && *it; it++)
{
const char *pkg = *it;
g_autoptr(GPtrArray) pkgs =
@ -805,11 +805,11 @@ rpmostreed_transaction_new_deploy (GDBusMethodInvocation *invocation,
const char *osname,
const char *refspec,
const char *revision,
const char *const *packages_added,
const char *const *packages_removed,
GUnixFDList *local_packages_added,
const char *const *override_remove_packages,
const char *const *override_reset_packages,
const char *const *install_pkgs,
GUnixFDList *install_local_pkgs,
const char *const *uninstall_pkgs,
const char *const *override_remove_pkgs,
const char *const *override_reset_pkgs,
GCancellable *cancellable,
GError **error)
{
@ -831,14 +831,12 @@ rpmostreed_transaction_new_deploy (GDBusMethodInvocation *invocation,
self->flags = flags;
self->refspec = g_strdup (refspec);
self->revision = g_strdup (revision);
self->packages_added = strdupv_canonicalize (packages_added);
self->packages_removed = strdupv_canonicalize (packages_removed);
if (local_packages_added != NULL)
self->local_packages_added = g_object_ref (local_packages_added);
self->override_remove_packages =
strdupv_canonicalize (override_remove_packages);
self->override_reset_packages =
strdupv_canonicalize (override_reset_packages);
self->install_pkgs = strdupv_canonicalize (install_pkgs);
if (install_local_pkgs != NULL)
self->install_local_pkgs = g_object_ref (install_local_pkgs);
self->uninstall_pkgs = strdupv_canonicalize (uninstall_pkgs);
self->override_remove_pkgs = strdupv_canonicalize (override_remove_pkgs);
self->override_reset_pkgs = strdupv_canonicalize (override_reset_pkgs);
}
return (RpmostreedTransaction *) self;

10
src/daemon/rpmostreed-transaction-types.h
View File

@ -65,11 +65,11 @@ rpmostreed_transaction_new_deploy (GDBusMethodInvocation *invocation,
const char *osname,
const char *refspec,
const char *revision,
const char *const *packages_added,
const char *const *packages_removed,
GUnixFDList *local_packages_added,
const char *const *override_remove_packages,
const char *const *override_reset_packages,
const char *const *install_pkgs,
GUnixFDList *install_local_pkgs,
const char *const *uninstall_pkgs,
const char *const *override_remove_pkgs,
const char *const *override_reset_pkgs,
GCancellable *cancellable,
GError **error);