forked from pool/cloud-init
Accepting request 401664 from Cloud:Tools
1 OBS-URL: https://build.opensuse.org/request/show/401664 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cloud-init?expand=0&rev=27
This commit is contained in:
commit
205b8307c2
22
cloud-init-python2-sigpipe.patch
Normal file
22
cloud-init-python2-sigpipe.patch
Normal file
@ -0,0 +1,22 @@
|
||||
Index: cloud-init-0.7.6/cloudinit/util.py
|
||||
===================================================================
|
||||
--- cloud-init-0.7.6.orig/cloudinit/util.py
|
||||
+++ cloud-init-0.7.6/cloudinit/util.py
|
||||
@@ -59,6 +59,7 @@ from cloudinit import version
|
||||
|
||||
from cloudinit.settings import (CFG_BUILTIN)
|
||||
|
||||
+from signal import signal, SIGPIPE, SIG_DFL
|
||||
|
||||
_DNS_REDIRECT_IP = None
|
||||
LOG = logging.getLogger(__name__)
|
||||
@@ -1559,7 +1560,8 @@ def subp(args, data=None, rcs=None, env=
|
||||
stdin = subprocess.PIPE
|
||||
sp = subprocess.Popen(args, stdout=stdout,
|
||||
stderr=stderr, stdin=stdin,
|
||||
- env=env, shell=shell)
|
||||
+ env=env, shell=shell,
|
||||
+ preexec_fn=lambda: signal(SIGPIPE, SIG_DFL))
|
||||
(out, err) = sp.communicate(data)
|
||||
except OSError as e:
|
||||
raise ProcessExecutionError(cmd=args, reason=e)
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 6 09:43:12 UTC 2016 - joachim.gleissner@suse.com
|
||||
|
||||
- Add cloud-init-python2-sigpipe.patch (bsc#903449)
|
||||
+ Restore SIGPIPE default handler when executing shell scripts
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 3 21:49:47 UTC 2016 - rjschwei@suse.com
|
||||
|
||||
|
@ -41,6 +41,8 @@ Patch11: dataSourceOpenNebula.patch
|
||||
Patch12: fix-default-systemd-unit-dir.patch
|
||||
Patch13: no_logic_change.patch
|
||||
Patch14: cloud-init-finalbeforelogin.patch
|
||||
# python2 disables SIGPIPE, causing broken pipe errors in shell scripts (bsc#903449)
|
||||
Patch20: cloud-init-python2-sigpipe.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: filesystem
|
||||
BuildRequires: python-devel
|
||||
@ -141,6 +143,7 @@ Unit tests for the cloud-init tools
|
||||
%patch12
|
||||
%patch13
|
||||
%patch14
|
||||
%patch20 -p1
|
||||
|
||||
%if 0%{?suse_version} <= 1130
|
||||
# disable ecdsa for SLE 11 (not available)
|
||||
|
Loading…
Reference in New Issue
Block a user