mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2024-12-26 17:01:14 -06:00
099cf98307
The ipautil.run function now returns an object with returncode and output are accessible as attributes. The stdout and stderr of all commands are logged (unless skip_output is given). The stdout/stderr contents must be explicitly requested with a keyword argument, otherwise they are None. This is because in Python 3, the output needs to be decoded, and that can fail if it's not decodable (human-readable) text. The raw (bytes) output is always available from the result object, as is "leniently" decoded output suitable for logging. All calls are changed to reflect this. A use of Popen in cainstance is changed to ipautil.run. Reviewed-By: Jan Cholasta <jcholast@redhat.com>
64 lines
1.9 KiB
Python
Executable File
64 lines
1.9 KiB
Python
Executable File
#!/usr/bin/python2 -E
|
|
#
|
|
# Authors:
|
|
# Jan Cholasta <jcholast@redhat.com>
|
|
#
|
|
# Copyright (C) 2015 Red Hat
|
|
# see file 'COPYING' for use and warranty information
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
from __future__ import print_function
|
|
|
|
import os
|
|
# Prevent garbage from readline on standard output
|
|
# (see https://fedorahosted.org/freeipa/ticket/4064)
|
|
if not os.isatty(1):
|
|
os.environ['TERM'] = 'dumb'
|
|
import sys
|
|
import syslog
|
|
import traceback
|
|
|
|
import six
|
|
|
|
from ipapython import ipautil
|
|
from ipaserver.install import certs
|
|
|
|
|
|
def main():
|
|
if len(sys.argv) < 2:
|
|
raise RuntimeError("Not enough arguments")
|
|
|
|
with certs.renewal_lock:
|
|
result = ipautil.run(sys.argv[1:], raiseonerr=False, env=os.environ)
|
|
if six.PY2:
|
|
sys.stdout.write(result.raw_output)
|
|
sys.stderr.write(result.raw_error_output)
|
|
else:
|
|
# Write bytes directly
|
|
sys.stdout.buffer.write(result.raw_output) #pylint: disable=no-member
|
|
sys.stderr.buffer.write(result.raw_error_output) #pylint: disable=no-member
|
|
sys.stdout.flush()
|
|
sys.stderr.flush()
|
|
|
|
return result.returncode
|
|
|
|
|
|
try:
|
|
sys.exit(main())
|
|
except Exception as e:
|
|
syslog.syslog(syslog.LOG_ERR, traceback.format_exc())
|
|
print("Internal error")
|
|
sys.exit(3)
|