diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-06 00:17:50 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-06 00:17:50 +0100 |
| commit | b6f946f039afad6cbc7027d52685072f7fbb8d35 (patch) | |
| tree | 9dc33d1ef9d307f1e3ed8a825902ff69bbe288f9 /gnu/packages/patches/ceph-volume-respect-PATH.patch | |
| parent | e32aea5472007507e62933b27a4db9a50810e5dc (diff) | |
| parent | bc8b2ffdac3f55414629ace5b1a0db32e9656c0a (diff) | |
| download | patches-b6f946f039afad6cbc7027d52685072f7fbb8d35.tar patches-b6f946f039afad6cbc7027d52685072f7fbb8d35.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/ceph-volume-respect-PATH.patch')
| -rw-r--r-- | gnu/packages/patches/ceph-volume-respect-PATH.patch | 22 |
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) |