Add patch to fix failing test for EPOCHREALTIME bash env [RH:1695953]
This commit is contained in:
parent
07a6b08f44
commit
8bc2e5eb74
31
cloud-init-17.1-exclude_EPOCHREALTIME.patch
Normal file
31
cloud-init-17.1-exclude_EPOCHREALTIME.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From d1a2fe7307e9cf2251d1f9a666c12d71d3f522d6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Chad Smith <chad.smith@canonical.com>
|
||||||
|
Date: Sat, 26 Jan 2019 15:06:42 +0000
|
||||||
|
Subject: opennebula: exclude EPOCHREALTIME as known bash env variable with a
|
||||||
|
delta
|
||||||
|
|
||||||
|
This branch is needed to allow cloud-init to sbuild on Ubuntu Disco.
|
||||||
|
|
||||||
|
OpenNebula:parse_shell_config tries to do a comparison of bash
|
||||||
|
environment values, excluding expected environment variables which
|
||||||
|
are known to change.
|
||||||
|
|
||||||
|
Bash on Ubuntu Disco surfaces a new EPOCHREALTIME environment variable
|
||||||
|
which wasn't in previous bash environments, this var needs to be
|
||||||
|
ignored by parse_shell_config too.
|
||||||
|
|
||||||
|
LP: #1813383
|
||||||
|
|
||||||
|
Index: cloud-init-17.1/cloudinit/sources/DataSourceOpenNebula.py
|
||||||
|
===================================================================
|
||||||
|
--- cloud-init-17.1.orig/cloudinit/sources/DataSourceOpenNebula.py
|
||||||
|
+++ cloud-init-17.1/cloudinit/sources/DataSourceOpenNebula.py
|
||||||
|
@@ -279,7 +279,7 @@ def parse_shell_config(content, keylist=
|
||||||
|
(output, _error) = util.subp(cmd, data=bcmd)
|
||||||
|
|
||||||
|
# exclude vars in bash that change on their own or that we used
|
||||||
|
- excluded = ("RANDOM", "LINENO", "SECONDS", "_", "__v")
|
||||||
|
+ excluded = ("EPOCHREALTIME", "RANDOM", "LINENO", "SECONDS", "_", "__v")
|
||||||
|
preset = {}
|
||||||
|
ret = {}
|
||||||
|
target = None
|
@ -23,6 +23,9 @@ Patch3: cloud-init-17.1-no-override-default-network.patch
|
|||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1569321
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1569321
|
||||||
Patch4: cloud-init-17.1-fix-local-ipv4-only.patch
|
Patch4: cloud-init-17.1-fix-local-ipv4-only.patch
|
||||||
|
|
||||||
|
# opennebula: exclude EPOCHREALTIME as known bash env variable with a delta.
|
||||||
|
Patch5: cloud-init-17.1-exclude_EPOCHREALTIME.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: pkgconfig(systemd)
|
BuildRequires: pkgconfig(systemd)
|
||||||
@ -157,6 +160,7 @@ nosetests-%{python3_version} tests/unittests/
|
|||||||
%changelog
|
%changelog
|
||||||
* Tue Apr 23 2019 Björn Esser <besser82@fedoraproject.org> - 17.1-9
|
* Tue Apr 23 2019 Björn Esser <besser82@fedoraproject.org> - 17.1-9
|
||||||
- Fix %%systemd_postun macro [RH:1695953]
|
- Fix %%systemd_postun macro [RH:1695953]
|
||||||
|
- Add patch to fix failing test for EPOCHREALTIME bash env [RH:1695953]
|
||||||
|
|
||||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 17.1-8
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 17.1-8
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
Loading…
Reference in New Issue
Block a user