"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "app/flatpak-builtins-utils.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-builtins-utils.c  (flatpak-1.15.1.tar.xz)	:	flatpak-builtins-utils.c  (flatpak-1.15.2.tar.xz)
skipping to change at line 676		skipping to change at line 676
return FALSE;		return FALSE;
for (i = 0; remotes[i] != NULL; i++)		for (i = 0; remotes[i] != NULL; i++)
{		{
g_autoptr(GError) local_error = NULL;		g_autoptr(GError) local_error = NULL;
guint64 ts_file_age;		guint64 ts_file_age;
ts_file_age = get_appstream_timestamp (dir, remotes[i], arch);		ts_file_age = get_appstream_timestamp (dir, remotes[i], arch);
if (ts_file_age < ttl)		if (ts_file_age < ttl)
{		{
g_debug ("%s:%s appstream age %" G_GUINT64_FORMAT " is less th an ttl %" G_GUINT64_FORMAT, remotes[i], arch, ts_file_age, ttl);		g_info ("%s:%s appstream age %" G_GUINT64_FORMAT " is less tha n ttl %" G_GUINT64_FORMAT, remotes[i], arch, ts_file_age, ttl);
continue;		continue;
}		}
else		else
g_debug ("%s:%s appstream age %" G_GUINT64_FORMAT " is greater t han ttl %" G_GUINT64_FORMAT, remotes[i], arch, ts_file_age, ttl);		g_info ("%s:%s appstream age %" G_GUINT64_FORMAT " is greater th an ttl %" G_GUINT64_FORMAT, remotes[i], arch, ts_file_age, ttl);
if (flatpak_dir_get_remote_disabled (dir, remotes[i]) ||		if (flatpak_dir_get_remote_disabled (dir, remotes[i]) ||
flatpak_dir_get_remote_noenumerate (dir, remotes[i]))		flatpak_dir_get_remote_noenumerate (dir, remotes[i]))
continue;		continue;
if (flatpak_dir_is_user (dir))		if (flatpak_dir_is_user (dir))
{		{
if (quiet)		if (quiet)
g_debug (_("Updating appstream data for user remote %s"), re motes[i]);		g_info (_("Updating appstream data for user remote %s"), rem otes[i]);
else		else
{		{
g_print (_("Updating appstream data for user remote %s"), remotes[i]);		g_print (_("Updating appstream data for user remote %s"), remotes[i]);
g_print ("\n");		g_print ("\n");
}		}
}		}
else		else
{		{
if (quiet)		if (quiet)
g_debug (_("Updating appstream data for remote %s"), remotes [i]);		g_info (_("Updating appstream data for remote %s"), remotes[ i]);
else		else
{		{
g_print (_("Updating appstream data for remote %s"), remot es[i]);		g_print (_("Updating appstream data for remote %s"), remot es[i]);
g_print ("\n");		g_print ("\n");
}		}
}		}
if (!flatpak_dir_update_appstream (dir, remotes[i], arch, &changed ,		if (!flatpak_dir_update_appstream (dir, remotes[i], arch, &changed ,
NULL, cancellable, &local_error ))		NULL, cancellable, &local_error ))
{		{
if (quiet)		if (quiet)
g_debug ("%s: %s", _("Error updating"), local_error->message );		g_info ("%s: %s", _("Error updating"), local_error->message) ;
else		else
g_printerr ("%s: %s\n", _("Error updating"), local_error->me ssage);		g_printerr ("%s: %s\n", _("Error updating"), local_error->me ssage);
}		}
}		}
}		}
}		}
else		else
{		{
gboolean found = FALSE;		gboolean found = FALSE;
skipping to change at line 734		skipping to change at line 734
if (flatpak_dir_has_remote (dir, remote, NULL))		if (flatpak_dir_has_remote (dir, remote, NULL))
{		{
guint64 ts_file_age;		guint64 ts_file_age;
found = TRUE;		found = TRUE;
ts_file_age = get_appstream_timestamp (dir, remote, arch);		ts_file_age = get_appstream_timestamp (dir, remote, arch);
if (ts_file_age < ttl)		if (ts_file_age < ttl)
{		{
g_debug ("%s:%s appstream age %" G_GUINT64_FORMAT " is less th an ttl %" G_GUINT64_FORMAT, remote, arch, ts_file_age, ttl);		g_info ("%s:%s appstream age %" G_GUINT64_FORMAT " is less tha n ttl %" G_GUINT64_FORMAT, remote, arch, ts_file_age, ttl);
continue;		continue;
}		}
else		else
g_debug ("%s:%s appstream age %" G_GUINT64_FORMAT " is greater t han ttl %" G_GUINT64_FORMAT, remote, arch, ts_file_age, ttl);		g_info ("%s:%s appstream age %" G_GUINT64_FORMAT " is greater th an ttl %" G_GUINT64_FORMAT, remote, arch, ts_file_age, ttl);
if (!flatpak_dir_update_appstream (dir, remote, arch, &changed,		if (!flatpak_dir_update_appstream (dir, remote, arch, &changed,
NULL, cancellable, error))		NULL, cancellable, error))
return FALSE;		return FALSE;
}		}
}		}
if (!found)		if (!found)
return flatpak_fail_error (error, FLATPAK_ERROR_REMOTE_NOT_FOUND,		return flatpak_fail_error (error, FLATPAK_ERROR_REMOTE_NOT_FOUND,
_("Remote \"%s\" not found"), remote);		_("Remote \"%s\" not found"), remote);
End of changes. 7 change blocks.
7 lines changed or deleted		7 lines changed or added

---