shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-19 22:50:35 +03:00
Code Issues Projects Releases Wiki Activity

libglnx porting: Port callers of gs_file_unlink to just unlink()

Browse Source 
In the second case it's actually less code too.

Closes: #312
Approved by: giuseppe
This commit is contained in:
Colin Walters 2016-05-29 13:33:25 -04:00 committed by Atomic Bot
parent 9d39d3af85
commit e5eb6f3a22
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libostree/ostree-repo.c
View File

@ -1255,8 +1255,11 @@ impl_repo_remote_delete (OstreeRepo *self,
if (remote->file != NULL)
{
if (!gs_file_unlink (remote->file, cancellable, error))
goto out;
if (unlink (gs_file_get_path_cached (remote->file)) != 0)
{
glnx_set_error_from_errno (error);
goto out;
}
}
else
{

21
src/libotutil/ot-gio-utils.c
View File

@ -390,25 +390,12 @@ ot_gfile_ensure_unlinked (GFile *path,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
GError *temp_error = NULL;
if (!gs_file_unlink (path, cancellable, &temp_error))
if (unlink (gs_file_get_path_cached (path)) != 0)
{
if (g_error_matches (temp_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
{
g_clear_error (&temp_error);
}
else
{
g_propagate_error (error, temp_error);
goto out;
}
if (errno != ENOENT)
return FALSE;
}
ret = TRUE;
out:
return ret;
return TRUE;
}
/**