"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "app/flatpak-main.c" between
flatpak-1.15.1.tar.xz and flatpak-1.15.2.tar.xz

About: Flatpak is a Linux application sandboxing and distribution framework. Pre-release.

flatpak-main.c  (flatpak-1.15.1.tar.xz)	:	flatpak-main.c  (flatpak-1.15.2.tar.xz)
skipping to change at line 360		skipping to change at line 360
return FALSE;		return FALSE;
/* We never want verbose output in the complete case, that breaks completion * /		/* We never want verbose output in the complete case, that breaks completion * /
if (is_in_complete)		if (is_in_complete)
{		{
g_log_set_default_handler (no_message_handler, NULL);		g_log_set_default_handler (no_message_handler, NULL);
}		}
else		else
{		{
if (opt_verbose > 0)		if (opt_verbose > 0)
g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, message_handler, NUL L);		g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, message_handler, NULL );
if (opt_verbose > 1)		if (opt_verbose > 1)
g_log_set_handler (G_LOG_DOMAIN "2", G_LOG_LEVEL_DEBUG, message_handler, NULL);		g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, message_handler, NUL L);
if (opt_ostree_verbose)		if (opt_ostree_verbose)
g_log_set_handler ("OSTree", G_LOG_LEVEL_DEBUG, message_handler, NULL);		g_log_set_handler ("OSTree", G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO, messa ge_handler, NULL);
if (opt_verbose > 0 || opt_ostree_verbose)		if (opt_verbose > 0 || opt_ostree_verbose)
flatpak_disable_fancy_output ();		flatpak_disable_fancy_output ();
}		}
/* sudo flatpak --user ... would operate on the root user's installation,		/* sudo flatpak --user ... would operate on the root user's installation,
* which is almost certainly not what the user intended so just consider it		* which is almost certainly not what the user intended so just consider it
* an error.		* an error.
*/		*/
if (opt_user && running_under_sudo ())		if (opt_user && running_under_sudo ())
skipping to change at line 613		skipping to change at line 613
const char *on_session;		const char *on_session;
on_session = g_getenv ("FLATPAK_SYSTEM_HELPER_ON_SESSION");		on_session = g_getenv ("FLATPAK_SYSTEM_HELPER_ON_SESSION");
if (on_session != NULL)		if (on_session != NULL)
return NULL;		return NULL;
bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &local_error);		bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &local_error);
if (bus == NULL)		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;		return NULL;
}		}
/* Install a polkit agent as fallback, in case we're running on a console */		/* Install a polkit agent as fallback, in case we're running on a console */
listener = flatpak_polkit_agent_text_listener_new (NULL, &local_error);		listener = flatpak_polkit_agent_text_listener_new (NULL, &local_error);
if (listener == NULL)		if (listener == NULL)
{		{
g_debug ("Failed to create polkit agent listener: %s", local_error->messag e);		g_info ("Failed to create polkit agent listener: %s", local_error->message );
}		}
else		else
{		{
g_autoptr(AutoPolkitSubject) subject = NULL;		g_autoptr(AutoPolkitSubject) subject = NULL;
GVariantBuilder opt_builder;		GVariantBuilder opt_builder;
g_autoptr(GVariant) options = NULL;		g_autoptr(GVariant) options = NULL;
subject = polkit_unix_process_new_for_owner (getpid (), 0, getuid ());		subject = polkit_unix_process_new_for_owner (getpid (), 0, getuid ());
g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT);		g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT);
skipping to change at line 645		skipping to change at line 645
agent = polkit_agent_listener_register_with_options (listener,		agent = polkit_agent_listener_register_with_options (listener,
POLKIT_AGENT_REGISTER _FLAGS_RUN_IN_THREAD,		POLKIT_AGENT_REGISTER _FLAGS_RUN_IN_THREAD,
subject,		subject,
NULL,		NULL,
options,		options,
NULL,		NULL,
&local_error);		&local_error);
if (agent == NULL)		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->m essage);
}		}
g_object_unref (listener);		g_object_unref (listener);
}		}
#endif		#endif
return agent;		return agent;
}		}
static void		static void
uninstall_polkit_agent (gpointer *agent)		uninstall_polkit_agent (gpointer *agent)
End of changes. 6 change blocks.
6 lines changed or deleted		6 lines changed or added

---