diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-05-07 21:36:49 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-05-07 21:36:49 +0200 |
| commit | 7a61788bc1d535213608a6f8d6b195f9a5519820 (patch) | |
| tree | 1ab06737aaabedf09c8b58234e39c0e3efc71d39 /pkgs/tools/filesystems/irods/irods_root_path.patch | |
| parent | d4dde073fd9d59f104d295df32f60ad8d56889ea (diff) | |
| parent | d316088c5b0b4e7ea27439c62aea60162c9bd0c4 (diff) | |
| download | nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.tar nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.tar.gz nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.tar.bz2 nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.tar.lz nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.tar.xz nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.tar.zst nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/filesystems/irods/irods_root_path.patch')
| -rw-r--r-- | pkgs/tools/filesystems/irods/irods_root_path.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/irods/irods_root_path.patch b/pkgs/tools/filesystems/irods/irods_root_path.patch new file mode 100644 index 000000000000..c88169ac023f --- /dev/null +++ b/pkgs/tools/filesystems/irods/irods_root_path.patch @@ -0,0 +1,11 @@ +--- a/lib/core/src/irods_default_paths.cpp 2016-10-24 17:09:02.955889536 +0200 ++++ b/lib/core/src/irods_default_paths.cpp 2016-10-24 17:09:43.178722157 +0200 +@@ -18,7 +18,7 @@ + try { + boost::filesystem::path path{dl_info.dli_fname}; + path = boost::filesystem::canonical(path); +- path.remove_filename().remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install ++ path.remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install + return path; + } catch(const boost::filesystem::filesystem_error& e) { + THROW(-1, e.what()); |