summary refs log tree commit diff
path: root/gnu/packages/patches/ceph-volume-respect-PATH.patch
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-03-04 13:07:14 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-03-04 22:06:24 +0100
commitc2d7e800e6788277bc56f31d5836f9d507dc1506 (patch)
tree6899a478600309b64dd1048a7030fade7acef7a4 /gnu/packages/patches/ceph-volume-respect-PATH.patch
parentd3c1e9272d3004b8f737104c292f7b31393a091d (diff)
downloadguix-c2d7e800e6788277bc56f31d5836f9d507dc1506.tar.gz
gnu: ceph: Update to 14.2.8.
* gnu/packages/patches/ceph-boost-compat.patch,
gnu/packages/patches/ceph-volume-respect-PATH.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/storage.scm (ceph): Update to 14.2.8.
[source](patches): Remove obsolete.
Diffstat (limited to 'gnu/packages/patches/ceph-volume-respect-PATH.patch')
-rw-r--r--gnu/packages/patches/ceph-volume-respect-PATH.patch22
1 files changed, 0 insertions, 22 deletions
diff --git a/gnu/packages/patches/ceph-volume-respect-PATH.patch b/gnu/packages/patches/ceph-volume-respect-PATH.patch
deleted file mode 100644
index 08a9a15ddd..0000000000
--- a/gnu/packages/patches/ceph-volume-respect-PATH.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Look for required tools in $PATH instead of just a handful locations.
-
-diff --git a/src/ceph-volume/ceph_volume/util/system.py b/src/ceph-volume/ceph_volume/util/system.py
-index b637f023a4..14516e1c65 100644
---- a/src/ceph-volume/ceph_volume/util/system.py
-+++ b/src/ceph-volume/ceph_volume/util/system.py
-@@ -33,14 +33,7 @@ def generate_uuid():
- 
- def which(executable):
-     """find the location of an executable"""
--    locations = (
--        '/usr/local/bin',
--        '/bin',
--        '/usr/bin',
--        '/usr/local/sbin',
--        '/usr/sbin',
--        '/sbin',
--    )
-+    locations = os.getenv('PATH').split(':')
- 
-     for location in locations:
-         executable_path = os.path.join(location, executable)