diff options
| author | sunnavy <sunnavy@bestpractical.com> | 2021-09-15 00:36:31 +0300 |
|---|---|---|
| committer | sunnavy <sunnavy@bestpractical.com> | 2021-09-15 00:36:31 +0300 |
| commit | edbeab18ff2a584d3da1bbcd58d4d0c3d180e25b (patch) | |
| tree | 35e61d57f98254e9c2814c97edd6a770df89eab9 | |
| parent | 4727a469f91a3a7331a47d32349fd648dc3fa87b (diff) | |
| parent | 8d461472f0e236fefcd29373f2f284de51a51e54 (diff) | |
Merge branch '4.4-trunk' into 4.4.5-relengrt-4.4.5
| -rw-r--r-- | lib/RT/Handle.pm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/RT/Handle.pm b/lib/RT/Handle.pm index bfdd84cbe8..ad7e26588c 100644 --- a/lib/RT/Handle.pm +++ b/lib/RT/Handle.pm @@ -468,6 +468,9 @@ sub InsertACL { $path = $base_path; } + # Get the full path since . is no longer in @INC after perl 5.24 + $path = Cwd::abs_path($path); + local *acl; do $path || return (0, "Couldn't load ACLs: " . $@); my @acl = acl($dbh); @@ -864,6 +867,8 @@ sub InsertData { local $@; + # Get the full path since . is no longer in @INC after perl 5.24 + $datafile = Cwd::abs_path($datafile); $RT::Logger->debug("Going to load '$datafile' data file"); my $datafile_content = do { |