diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/debian/cpanplus_config_path.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.14.3/debian/cpanplus_config_path.diff | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/cpanplus_config_path.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/cpanplus_config_path.diff new file mode 100644 index 0000000000..f33221c3d1 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/cpanplus_config_path.diff | |||
@@ -0,0 +1,45 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From 9825086b15f34f365a272cc8d6caf4e2044bede6 Mon Sep 17 00:00:00 2001 | ||
3 | From: Niko Tyni <ntyni@debian.org> | ||
4 | Date: Mon, 6 Jul 2009 22:17:53 +0300 | ||
5 | Subject: Save local versions of CPANPLUS::Config::System into /etc/perl. | ||
6 | |||
7 | This is a configuration file and needs to go in /etc by policy. | ||
8 | Besides, /usr may not even be writable. | ||
9 | |||
10 | This mirrors the Debian setup of CPAN.pm in debian/cpan_config_path. | ||
11 | |||
12 | See #533707. | ||
13 | |||
14 | Patch-Name: debian/cpanplus_config_path.diff | ||
15 | --- | ||
16 | cpan/CPANPLUS/lib/CPANPLUS/Configure.pm | 1 + | ||
17 | cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm | 3 +++ | ||
18 | 2 files changed, 4 insertions(+), 0 deletions(-) | ||
19 | |||
20 | diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm | ||
21 | index ba1ca07..25cbe5f 100644 | ||
22 | --- a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm | ||
23 | +++ b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm | ||
24 | @@ -280,6 +280,7 @@ Saves the configuration to the package name you provided. | ||
25 | If this package is not C<CPANPLUS::Config::System>, it will | ||
26 | be saved in your C<.cpanplus> directory, otherwise it will | ||
27 | be attempted to be saved in the system wide directory. | ||
28 | +(On Debian systems, this system wide directory is /etc/perl.) | ||
29 | |||
30 | If no argument is provided, it will default to your personal | ||
31 | config. | ||
32 | diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm | ||
33 | index 443d5a4..f7085a8 100644 | ||
34 | --- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm | ||
35 | +++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm | ||
36 | @@ -209,6 +209,9 @@ use constant CONFIG_USER_FILE => sub { | ||
37 | ) . '.pm'; | ||
38 | }; | ||
39 | use constant CONFIG_SYSTEM_FILE => sub { | ||
40 | + # Debian-specific shortcut | ||
41 | + return '/etc/perl/CPANPLUS/Config/System.pm'; | ||
42 | + | ||
43 | require CPANPLUS::Internals; | ||
44 | require File::Basename; | ||
45 | my $dir = File::Basename::dirname( | ||