File: load_rt_generated.diff

package info (click to toggle)
request-tracker4 4.4.6%2Bdfsg-1.1%2Bdeb12u3
  • links: PTS, VCS
  • area: main
  • in suites: bookworm-proposed-updates
  • size: 63,472 kB
  • sloc: javascript: 130,444; perl: 65,299; sh: 1,322; makefile: 471; python: 37; php: 30
file content (29 lines) | stat: -rw-r--r-- 889 bytes parent folder | download | duplicates (2) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
 
From 4cd3357b9ff3430fca358707b2649038eda5e495 Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Wed, 6 May 2015 22:29:35 +0000
Subject: Load RT::Generated directly from @INC

This allows for the possibility of overriding RT::Generated in test
scenarios.

Patch-Name: load_rt_generated.diff
---
 lib/RT.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/RT.pm b/lib/RT.pm
index ae028e2c..c6925bf2 100644
--- a/lib/RT.pm
+++ b/lib/RT.pm
@@ -859,10 +859,8 @@ sub InstallMode {
 
 sub LoadGeneratedData {
     my $class = shift;
-    my $pm_path = ( File::Spec->splitpath( $INC{'RT.pm'} ) )[1];
-    $pm_path = File::Spec->rel2abs( $pm_path );
 
-    require "$pm_path/RT/Generated.pm" || die "Couldn't load RT::Generated: $@";
+    require RT::Generated || die "Couldn't load RT::Generated: $@";
     $class->CanonicalizeGeneratedPaths();
 }