diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-07-22 09:08:32 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-07-22 09:38:32 -0400 |
| commit | 7d544a289852c761fc209772064f794fb0472198 (patch) | |
| tree | bb80ccb53de32bd6956eacba29c8b49f15d190a4 /src/lib/Bcfg2/Options.py | |
| parent | 360ba2e77865d2a292568ede99d8896ef7742056 (diff) | |
| download | bcfg2-7d544a289852c761fc209772064f794fb0472198.tar.gz bcfg2-7d544a289852c761fc209772064f794fb0472198.tar.bz2 bcfg2-7d544a289852c761fc209772064f794fb0472198.zip | |
Packages: Added timeout to bcfg2-yum-helper calls
This involved making the Yum backend use Bcfg2.Utils.Executor to call
bcfg2-yum-helper instead of subprocess.Popen directly. This was
cherry-picked (kinda) from 3d06f311274d6b942ee89d8cdb13b2ecc99af1b0,
so will likely break the maint -> master merge in spectacular ways.
Diffstat (limited to 'src/lib/Bcfg2/Options.py')
| -rw-r--r-- | src/lib/Bcfg2/Options.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py index dba3e96ef..3d105bf30 100644 --- a/src/lib/Bcfg2/Options.py +++ b/src/lib/Bcfg2/Options.py @@ -1221,7 +1221,8 @@ SERVER_COMMON_OPTIONS = dict(repo=SERVER_REPOSITORY, authentication=SERVER_AUTHENTICATION, perflog=LOG_PERFORMANCE, perflog_interval=PERFLOG_INTERVAL, - children=SERVER_CHILDREN) + children=SERVER_CHILDREN, + client_timeout=CLIENT_TIMEOUT) CRYPT_OPTIONS = dict(encrypt=ENCRYPT, decrypt=DECRYPT, |