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

compose: Respect absolute paths for postprocess-script again

Browse Source 
Regressed from some code refactoring.

Closes: #491
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-10-14 12:19:13 -04:00 committed by Atomic Bot
parent 56f3f509a1
commit a15364c185
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libpriv/rpmostree-postprocess.c
View File

@ -1797,8 +1797,15 @@ rpmostree_treefile_postprocessing (int rootfs_fd,
if (postprocess_script)
{
const char *bn = glnx_basename (postprocess_script);
g_autofree char *src = g_build_filename (gs_file_get_path_cached (context_directory), postprocess_script, NULL);
g_autofree char *binpath = g_strconcat ("/usr/bin/rpmostree-postprocess-", bn, NULL);
g_autofree char *src = NULL;
g_autofree char *binpath = NULL;
if (g_path_is_absolute (postprocess_script))
src = g_strdup (postprocess_script);
else
src = g_build_filename (gs_file_get_path_cached (context_directory), postprocess_script, NULL);
binpath = g_strconcat ("/usr/bin/rpmostree-postprocess-", bn, NULL);
/* Clone all the things */
/* Note we need to make binpath *not* absolute here */