napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add check_chroot_output to Python interface.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-08-08 14:20:09 +02:00
parent f90bf469dd
commit eb6b8ac613
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/libcalamares/PythonJob.cpp
View File

@ -49,6 +49,12 @@ BOOST_PYTHON_FUNCTION_OVERLOADS( check_chroot_call_str_overloads,
BOOST_PYTHON_FUNCTION_OVERLOADS( check_chroot_call_list_overloads, BOOST_PYTHON_FUNCTION_OVERLOADS( check_chroot_call_list_overloads,
CalamaresPython::check_chroot_call, CalamaresPython::check_chroot_call,
1, 3 ); 1, 3 );
BOOST_PYTHON_FUNCTION_OVERLOADS( check_chroot_output_str_overloads,
CalamaresPython::check_chroot_output,
1, 3 );
BOOST_PYTHON_FUNCTION_OVERLOADS( check_chroot_output_list_overloads,
CalamaresPython::check_chroot_output,
1, 3 );
BOOST_PYTHON_MODULE( libcalamares ) BOOST_PYTHON_MODULE( libcalamares )
{ {
bp::object package = bp::scope(); bp::object package = bp::scope();
@ -171,6 +177,35 @@ BOOST_PYTHON_MODULE( libcalamares )
"successfully, or raises a subprocess.CalledProcessError." "successfully, or raises a subprocess.CalledProcessError."
) )
); );
bp::def(
"check_chroot_output",
static_cast< std::string (*)( const std::string&,
const std::string&,
int ) >( &CalamaresPython::check_chroot_output ),
check_chroot_output_str_overloads(
bp::args( "command",
"stdin",
"timeout" ),
"Runs the specified command in the chroot of the target system.\n"
"Returns the program's standard output, and raises a "
"subprocess.CalledProcessError if something went wrong."
)
);
bp::def(
"check_chroot_output",
static_cast< std::string (*)( const bp::list&,
const std::string&,
int ) >( &CalamaresPython::check_chroot_output ),
check_chroot_output_list_overloads(
bp::args( "args",
"stdin",
"timeout" ),
"Runs the specified command in the chroot of the target system.\n"
"Returns the program's standard output, and raises a "
"subprocess.CalledProcessError if something went wrong."
)
);
} }