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

daemon: Complete output-to-self rename

Browse Source 
To reduce confusion in future versions of myself and other readers,
complete the suggested rename from "redirect-output" to "output-to-self"
to internal variable names as well.

Closes: #1283
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-03-01 14:18:09 +00:00 committed by Atomic Bot
parent 36071d3c69
commit f6fb505cac
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -692,12 +692,12 @@ start_deployment_txn (GDBusMethodInvocation *invocation,
return FALSE; return FALSE;
} }
const gboolean redirect_output = const gboolean output_to_self =
vardict_lookup_bool (&options_dict, "output-to-self", FALSE); vardict_lookup_bool (&options_dict, "output-to-self", FALSE);
default_flags = deploy_flags_from_options (options, default_flags); default_flags = deploy_flags_from_options (options, default_flags);
return rpmostreed_transaction_new_deploy (invocation, ot_sysroot, return rpmostreed_transaction_new_deploy (invocation, ot_sysroot,
default_flags, default_flags,
redirect_output, output_to_self,
osname, osname,
canon_refspec, canon_refspec,
revision, revision,

6
src/daemon/rpmostreed-sysroot.c
View File

@ -106,14 +106,14 @@ sysroot_output_cb (RpmOstreeOutputType type, void *data, void *opaque)
{ {
RpmostreedSysroot *self = RPMOSTREED_SYSROOT (opaque); RpmostreedSysroot *self = RPMOSTREED_SYSROOT (opaque);
glnx_unref_object RpmostreedTransaction *transaction = NULL; glnx_unref_object RpmostreedTransaction *transaction = NULL;
gboolean redirect = FALSE; gboolean output_to_self = FALSE;
transaction = transaction =
rpmostreed_transaction_monitor_ref_active_transaction (self->transaction_monitor); rpmostreed_transaction_monitor_ref_active_transaction (self->transaction_monitor);
if (transaction) if (transaction)
g_object_get (transaction, "output-to-self", &redirect, NULL); g_object_get (transaction, "output-to-self", &output_to_self, NULL);
if (!transaction || redirect) if (!transaction || output_to_self)
{ {
rpmostree_output_default_handler (type, data, opaque); rpmostree_output_default_handler (type, data, opaque);
return; return;

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

@ -1133,7 +1133,7 @@ RpmostreedTransaction *
rpmostreed_transaction_new_deploy (GDBusMethodInvocation *invocation, rpmostreed_transaction_new_deploy (GDBusMethodInvocation *invocation,
OstreeSysroot *sysroot, OstreeSysroot *sysroot,
RpmOstreeTransactionDeployFlags flags, RpmOstreeTransactionDeployFlags flags,
gboolean redirect_output, gboolean output_to_self,
const char *osname, const char *osname,
const char *refspec, const char *refspec,
const char *revision, const char *revision,
@ -1156,7 +1156,7 @@ rpmostreed_transaction_new_deploy (GDBusMethodInvocation *invocation,
cancellable, error, cancellable, error,
"invocation", invocation, "invocation", invocation,
"sysroot-path", gs_file_get_path_cached (ostree_sysroot_get_path (sysroot)), "sysroot-path", gs_file_get_path_cached (ostree_sysroot_get_path (sysroot)),
"output-to-self", redirect_output, "output-to-self", output_to_self,
NULL); NULL);
if (self != NULL) if (self != NULL)

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

@ -65,7 +65,7 @@ RpmostreedTransaction *
rpmostreed_transaction_new_deploy (GDBusMethodInvocation *invocation, rpmostreed_transaction_new_deploy (GDBusMethodInvocation *invocation,
OstreeSysroot *sysroot, OstreeSysroot *sysroot,
RpmOstreeTransactionDeployFlags flags, RpmOstreeTransactionDeployFlags flags,
gboolean redirect_output, gboolean output_to_self,
const char *osname, const char *osname,
const char *refspec, const char *refspec,
const char *revision, const char *revision,