marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add some hints when icons are not found 

We have some extra conditions here that are not evident
from the rename-icon key in the manifest, so add some
verbose output to make it easier to figure out why an
icon is not renamed.
tingping/wmclass
Matthias Clasen 2017-05-20 15:18:39 -04:00 committed by Alexander Larsson
parent e63d089435
commit c2ed604b2e
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
builder/builder-manifest.c
View File

@ -1733,29 +1733,40 @@ rename_icon_cb (BuilderManifest *self,
int depth,
GError **error)
{
if (S_ISREG (stbuf->st_mode) &&
depth == 3 &&
g_str_has_prefix (source_name, self->rename_icon) &&
(g_str_has_prefix (source_name + strlen (self->rename_icon), ".") ||
g_str_has_prefix (source_name + strlen (self->rename_icon), "-symbolic.")))
if (g_str_has_prefix (source_name, self->rename_icon))
{
const char *extension = source_name + strlen (self->rename_icon);
g_autofree char *new_name = g_strconcat (self->id, extension, NULL);
int res;
*found = TRUE;
g_print ("%s icon %s/%s to %s/%s\n", self->copy_icon ? "Copying" : "Renaming", rel_dir, source_name, rel_dir, new_name);
if (self->copy_icon)
res = linkat (source_parent_fd, source_name, source_parent_fd, new_name, AT_SYMLINK_FOLLOW);
else
res = renameat (source_parent_fd, source_name, source_parent_fd, new_name);
if (res != 0)
if (S_ISREG (stbuf->st_mode) &&
depth == 3 &&
(g_str_has_prefix (source_name + strlen (self->rename_icon), ".") ||
g_str_has_prefix (source_name + strlen (self->rename_icon), "-symbolic.")))
{
g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "Can't rename icon %s/%s", rel_dir, source_name);
return FALSE;
const char *extension = source_name + strlen (self->rename_icon);
g_autofree char *new_name = g_strconcat (self->id, extension, NULL);
int res;
*found = TRUE;
g_print ("%s icon %s/%s to %s/%s\n", self->copy_icon ? "Copying" : "Renaming", rel_dir, source_name, rel_dir, new_name);
if (self->copy_icon)
res = linkat (source_parent_fd, source_name, source_parent_fd, new_name, AT_SYMLINK_FOLLOW);
else
res = renameat (source_parent_fd, source_name, source_parent_fd, new_name);
if (res != 0)
{
g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "Can't rename icon %s/%s", rel_dir, source_name);
return FALSE;
}
}
else
{
if (!S_ISREG (stbuf->st_mode))
g_debug ("%s/%s matches 'rename-icon', but not a regular file", full_dir, source_name);
else if (depth != 3)
g_debug ("%s/%s matches 'rename-icon', but not at depth 3", full_dir, source_name);
else
g_debug ("%s/%s matches 'rename-icon', but name does not continue with '.' or '-symbolic.'", full_dir, source_name);
}
}