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

libpriv/bwrap: Add bwrap_run_captured()

Browse Source 
The `GSubprocess` API has a great `g_subprocess_communicate` function
that makes it easy to capture stdout and/or stderr. Let's expose that.

Closes: #1481
Approved by: jlebon
This commit is contained in:
Jonathan Lebon 2018-07-31 15:39:26 -04:00 committed by Atomic Bot
parent 1c899c5e9e
commit 5219df0875
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/libpriv/rpmostree-bwrap.c
View File

@ -379,11 +379,13 @@ rpmostree_bwrap_setenv (RpmOstreeBwrap *bwrap, const char *name, const char *val
g_subprocess_launcher_setenv (bwrap->launcher, name, value, TRUE);
}
/* Execute @bwrap - must have been configured. After executing this method, the
* @bwrap instance cannot be run again.
/* Execute @bwrap, optionally capturing stdout or stderr. Must have been configured. After
* executing this method, the @bwrap instance cannot be run again.
*/
gboolean
rpmostree_bwrap_run (RpmOstreeBwrap *bwrap,
rpmostree_bwrap_run_captured (RpmOstreeBwrap *bwrap,
GBytes **stdout_buf,
GBytes **stderr_buf,
GCancellable *cancellable,
GError **error)
{
@ -399,12 +401,25 @@ rpmostree_bwrap_run (RpmOstreeBwrap *bwrap,
/* Add the final NULL */
g_ptr_array_add (bwrap->argv, NULL);
if (stdout_buf)
g_subprocess_launcher_set_flags (bwrap->launcher, G_SUBPROCESS_FLAGS_STDOUT_PIPE);
if (stderr_buf)
g_subprocess_launcher_set_flags (bwrap->launcher, G_SUBPROCESS_FLAGS_STDERR_PIPE);
g_subprocess_launcher_set_child_setup (launcher, bwrap_child_setup, bwrap, NULL);
g_autoptr(GSubprocess) subproc =
g_subprocess_launcher_spawnv (launcher, (const char *const*)bwrap->argv->pdata,
error);
if (!subproc)
return FALSE;
if (stdout_buf || stderr_buf)
{
if (!g_subprocess_communicate (subproc, NULL, cancellable,
stdout_buf, stderr_buf, error))
return FALSE;
}
if (!g_subprocess_wait (subproc, cancellable, error))
{
/* Now, it's possible @cancellable has been set, which means the process
@ -426,6 +441,17 @@ rpmostree_bwrap_run (RpmOstreeBwrap *bwrap,
return TRUE;
}
/* Execute @bwrap. Must have been configured. After executing this method, the @bwrap
* instance cannot be run again.
*/
gboolean
rpmostree_bwrap_run (RpmOstreeBwrap *bwrap,
GCancellable *cancellable,
GError **error)
{
return rpmostree_bwrap_run_captured (bwrap, NULL, NULL, cancellable, error);
}
/* Execute /bin/true inside a bwrap container on the host */
gboolean
rpmostree_bwrap_selftest (GError **error)

6
src/libpriv/rpmostree-bwrap.h
View File

@ -56,6 +56,12 @@ void rpmostree_bwrap_set_child_setup (RpmOstreeBwrap *bwrap,
GSpawnChildSetupFunc func,
gpointer data);
gboolean rpmostree_bwrap_run_captured (RpmOstreeBwrap *bwrap,
GBytes **stdout_buf,
GBytes **stderr_buf,
GCancellable *cancellable,
GError **error);
gboolean rpmostree_bwrap_run (RpmOstreeBwrap *bwrap,
GCancellable *cancellable,
GError **error);