Commit e51caae2 authored by Thomas Goirand's avatar Thomas Goirand

* Removed patches applied upstream:

    - sphinx_reproducible_build.patch
    - fix-xattr_supported_check.patch
parent a4b961ff
......@@ -4,6 +4,9 @@ swift (2.23.0-1) experimental; urgency=medium
* Fixed version of eventlet in (b-)d for this release.
* Add python3-barbicanclient and python3-castellan as recommends in
swift-proxy, as they are needed for on-disk encryption.
* Removed patches applied upstream:
- sphinx_reproducible_build.patch
- fix-xattr_supported_check.patch
-- Thomas Goirand <zigo@debian.org> Fri, 04 Oct 2019 15:59:04 +0200
......
Description: Fix test_parse_get_node_args
The function xattr_supported_check() was missing ERANGE
Author: Thomas Goirand <zigo@debian.org>
Forwarded: https://review.opendev.org/670894
Last-Update: 2019-07-15
--- swift-2.21.10+2019.07.13+git.4643412bd1.orig/test/unit/__init__.py
+++ swift-2.21.10+2019.07.13+git.4643412bd1/test/unit/__init__.py
@@ -1367,7 +1367,7 @@ def xattr_supported_check():
fd, tmppath = mkstemp()
xattr.setxattr(fd, 'user.swift.testing_key', big_val)
except IOError as e:
- if errno.errorcode.get(e.errno) in ('ENOSPC', 'ENOTSUP', 'EOPNOTSUPP'):
+ if errno.errorcode.get(e.errno) in ('ENOSPC', 'ENOTSUP', 'EOPNOTSUPP', 'ERANGE'):
# filesystem does not support xattr of this size
return False
raise
sphinx_reproducible_build.patch
syslog_log_name.patch
fix-xattr_supported_check.patch
Description: Use SOURCE_DATE_EPOCH in docs to make build reproducible
Author: Ondřej Nový <ondrej.novy@firma.seznam.cz>
Date: Mon Aug 20 10:11:15 2018 +0200
Forwarded: https://review.openstack.org/593535
Use SOURCE_DATE_EPOCH in docs to make build reproducible
Set copyright year and html_last_updated_fmt to SOURCE_DATE_EPOCH if
it's set. See https://reproducible-builds.org/specs/source-date-epoch/
This patch make build reproducible, see https://reproducible-builds.org/
Change-Id: I730a8265ca2c70c639ef77a613908e84eb738b70
diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index 9c30acbb3..991e4ad4c 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -23,6 +23,7 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
+import datetime
import os
from swift import __version__
import subprocess
@@ -154,18 +155,19 @@
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
# html_last_updated_fmt = '%b %d, %Y'
-git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local",
- "-n1"]
-try:
- html_last_updated_fmt = subprocess.Popen(
- git_cmd, stdout=subprocess.PIPE).communicate()[0]
-except OSError:
- warnings.warn('Cannot get last updated time from git repository. '
- 'Not setting "html_last_updated_fmt".')
+
+if 'SOURCE_DATE_EPOCH' in os.environ:
+ now = float(os.environ.get('SOURCE_DATE_EPOCH'))
+ html_last_updated_fmt = datetime.datetime.utcfromtimestamp(now).isoformat()
else:
- if not isinstance(html_last_updated_fmt, str):
- # for py3
- html_last_updated_fmt = html_last_updated_fmt.decode('ascii')
+ git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'",
+ "--date=local", "-n1"]
+ try:
+ html_last_updated_fmt = subprocess.Popen(
+ git_cmd, stdout=subprocess.PIPE).communicate()[0]
+ except OSError:
+ warnings.warn('Cannot get last updated time from git repository. '
+ 'Not setting "html_last_updated_fmt".')
# If true, SmartyPants will be used to convert quotes and dashes to
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment