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