Catch up with a devstack change in a patch.
Change-Id: I145358e46033479ffee65cd3851c822a6fc1935a
diff --git a/patches/openstack/devstack/eatmydata.patch b/patches/openstack/devstack/eatmydata.patch
index 4f6000e..b356418 100644
--- a/patches/openstack/devstack/eatmydata.patch
+++ b/patches/openstack/devstack/eatmydata.patch
@@ -1,7 +1,7 @@
-From 46d056ce686691524e835178f0ad6eb14d3c58f3 Mon Sep 17 00:00:00 2001
+From c4219b81032a4208e765e862f60a7714009be963 Mon Sep 17 00:00:00 2001
From: Peter Penchev <openstack-dev@storpool.com>
Date: Sun, 6 Sep 2020 16:01:31 +0300
-Subject: [PATCH 1/2] DNM: use eatmydata for apt-get and pip.
+Subject: [PATCH] DNM: use eatmydata for apt-get and pip.
Change-Id: I4db4129f8b8f654aa763fafaaefdae5386cbb9a7
---
@@ -10,10 +10,10 @@
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/functions-common b/functions-common
-index 11679e4a..70a85f7b 100644
+index be966e96..d859fcd1 100644
--- a/functions-common
+++ b/functions-common
-@@ -1114,7 +1114,7 @@ function apt_get {
+@@ -1231,7 +1231,7 @@ function apt_get {
$sudo DEBIAN_FRONTEND=noninteractive \
http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
no_proxy=${no_proxy:-} \
@@ -23,18 +23,18 @@
# stop the clock
diff --git a/inc/python b/inc/python
-index 9382d352..f97ebe3a 100644
+index d032a10e..cef012fc 100644
--- a/inc/python
+++ b/inc/python
-@@ -195,6 +195,7 @@ function pip_install {
+@@ -194,6 +194,7 @@ function pip_install {
+ https_proxy="${https_proxy:-}" \
no_proxy="${no_proxy:-}" \
PIP_FIND_LINKS=$PIP_FIND_LINKS \
- SETUPTOOLS_SYS_PATH_TECHNIQUE=rewrite \
+ eatmydata \
$cmd_pip $upgrade \
$@
result=$?
-@@ -216,7 +217,7 @@ function pip_uninstall {
+@@ -215,7 +216,7 @@ function pip_uninstall {
local sudo_pip="sudo -H LC_ALL=en_US.UTF-8"
fi
# don't error if we can't uninstall, it might not be there
@@ -43,7 +43,7 @@
}
# get version of a package from global requirements file
-@@ -481,7 +482,7 @@ function install_devstack_tools {
+@@ -480,7 +481,7 @@ function install_devstack_tools {
# intentionally old to ensure devstack-gate has control
local dstools_version=${DSTOOLS_VERSION:-0.1.2}
install_python3
@@ -53,5 +53,5 @@
# Restore xtrace
--
-2.30.2
+2.35.1