Blame SOURCES/CPAN-2.11-Replace-configuration-directory-string-with-a-marke.patch

b84bcc
From 22a4e38d49b342d0e65f0a0918ccd14df5d26234 Mon Sep 17 00:00:00 2001
b84bcc
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
b84bcc
Date: Wed, 28 Jan 2015 13:21:10 +0100
b84bcc
Subject: [PATCH] Replace configuration directory string with a marker
b84bcc
MIME-Version: 1.0
b84bcc
Content-Type: text/plain; charset=UTF-8
b84bcc
Content-Transfer-Encoding: 8bit
b84bcc
b84bcc
This allows to redefine the configuration directory name at build
b84bcc
time.
b84bcc
b84bcc
Signed-off-by: Petr Písař <ppisar@redhat.com>
b84bcc
---
b84bcc
 Makefile.PL              | 10 +++++-----
b84bcc
 README                   | 10 +++++-----
b84bcc
 lib/CPAN.pm              | 10 +++++-----
b84bcc
 lib/CPAN/HandleConfig.pm |  2 +-
b84bcc
 scripts/cpan-mirrors     |  2 +-
b84bcc
 5 files changed, 17 insertions(+), 17 deletions(-)
b84bcc
b84bcc
diff --git a/Makefile.PL b/Makefile.PL
b84bcc
index 2f9917b..7ffd773 100644
b84bcc
--- a/Makefile.PL
b84bcc
+++ b/Makefile.PL
b84bcc
@@ -332,21 +332,21 @@ record-session :
b84bcc
 	$(PERL) -Ilib -MCPAN -e '$$CPAN::Suppress_readline=$$CPAN::Echo_readline=1;shell' | tee ttt.out
b84bcc
 
b84bcc
 run-with-sqlite :
b84bcc
-	$(PERL) -I$$HOME/.cpan -Ilib -MCPAN::SQLite -MCPAN::MyConfig -MCPAN -e '$$CPAN::Config->{use_sqlite}++; $$CPAN::Config->{sqlite_dbname}="cpandb-sqlite"; shell'
b84bcc
+	$(PERL) -I$$HOME/.XCPANCONFIGNAMEX -Ilib -MCPAN::SQLite -MCPAN::MyConfig -MCPAN -e '$$CPAN::Config->{use_sqlite}++; $$CPAN::Config->{sqlite_dbname}="cpandb-sqlite"; shell'
b84bcc
 
b84bcc
 testrun_very_offline : rm_mirrored_by run_emu_offline
b84bcc
 
b84bcc
 testrun_emu_offline :
b84bcc
-	$(PERL) -I$$HOME/.cpan -Ilib -MCPAN::MyConfig -MCPAN -e '@CPAN::Defaultsites = qw(file:///dev/null); $$CPAN::Config->{urllist} = []; shell'
b84bcc
+	$(PERL) -I$$HOME/.XCPANCONFIGNAMEX -Ilib -MCPAN::MyConfig -MCPAN -e '@CPAN::Defaultsites = qw(file:///dev/null); $$CPAN::Config->{urllist} = []; shell'
b84bcc
 
b84bcc
 rm_mirrored_by :
b84bcc
-	rm -f $$HOME/.cpan/sources/MIRRORED.BY*
b84bcc
+	rm -f $$HOME/.XCPANCONFIGNAMEX/sources/MIRRORED.BY*
b84bcc
 
b84bcc
 testrun_http_only :
b84bcc
-	$(PERL) -I$$HOME/.cpan -Ilib -MCPAN::MyConfig -MCPAN -e '$$CPAN::Config->{urllist} = [qw(http://www.planet-elektronik.de/CPAN/)]; shell'
b84bcc
+	$(PERL) -I$$HOME/.XCPANCONFIGNAMEX -Ilib -MCPAN::MyConfig -MCPAN -e '$$CPAN::Config->{urllist} = [qw(http://www.planet-elektronik.de/CPAN/)]; shell'
b84bcc
 
b84bcc
 urllist :
b84bcc
-	$(PERL) -Ilib -MCPAN -MCPAN::FirstTime -e 'CPAN::FirstTime::init("$$ENV{HOME}/.cpan/CPAN/MyConfig", args => [qw(urllist)])'
b84bcc
+	$(PERL) -Ilib -MCPAN -MCPAN::FirstTime -e 'CPAN::FirstTime::init("$$ENV{HOME}/.XCPANCONFIGNAMEX/CPAN/MyConfig", args => [qw(urllist)])'
b84bcc
 
b84bcc
 runadmin :
b84bcc
 	$(PERL) -Ilib -MCPAN::Admin -eshell
b84bcc
diff --git a/README b/README
b84bcc
index 5b945ca..0344805 100644
b84bcc
--- a/README
b84bcc
+++ b/README
b84bcc
@@ -269,7 +269,7 @@ DESCRIPTION
b84bcc
       restarting the whole get/make/test/install procedure from scratch.
b84bcc
 
b84bcc
     Lockfile
b84bcc
-      Interactive sessions maintain a lockfile, by default "~/.cpan/.lock".
b84bcc
+      Interactive sessions maintain a lockfile, by default "~/.XCPANCONFIGNAMEX/.lock".
b84bcc
       Batch jobs can run without a lockfile and not disturb each other.
b84bcc
 
b84bcc
       The shell offers to run in *downgraded mode* when another process is
b84bcc
@@ -329,7 +329,7 @@ DESCRIPTION
b84bcc
         "install_tested".
b84bcc
 
b84bcc
   mkmyconfig
b84bcc
-    mkmyconfig() writes your own CPAN::MyConfig file into your "~/.cpan/"
b84bcc
+    mkmyconfig() writes your own CPAN::MyConfig file into your "~/.XCPANCONFIGNAMEX/"
b84bcc
     directory so that you can save your own preferences instead of the
b84bcc
     system-wide ones.
b84bcc
 
b84bcc
@@ -526,7 +526,7 @@ CONFIGURATION
b84bcc
 
b84bcc
     Default values defined in the CPAN/Config.pm file can be overridden in a
b84bcc
     user specific file: CPAN/MyConfig.pm. Such a file is best placed in
b84bcc
-    "$HOME/.cpan/CPAN/MyConfig.pm", because "$HOME/.cpan" is added to the
b84bcc
+    "$HOME/.XCPANCONFIGNAMEX/CPAN/MyConfig.pm", because "$HOME/.XCPANCONFIGNAMEX" is added to the
b84bcc
     search path of the CPAN module before the use() or require() statements.
b84bcc
     The mkmyconfig command writes this file for you.
b84bcc
 
b84bcc
@@ -1989,8 +1989,8 @@ FAQ
b84bcc
 
b84bcc
         You may want to configure something like
b84bcc
 
b84bcc
-          o conf make_arg "| tee -ai /root/.cpan/logs/make.out"
b84bcc
-          o conf make_install_arg "| tee -ai /root/.cpan/logs/make_install.out"
b84bcc
+          o conf make_arg "| tee -ai /root/.XCPANCONFIGNAMEX/logs/make.out"
b84bcc
+          o conf make_install_arg "| tee -ai /root/.XCPANCONFIGNAMEX/logs/make_install.out"
b84bcc
 
b84bcc
         so that STDOUT is captured in a file for later inspection.
b84bcc
 
b84bcc
diff --git a/lib/CPAN.pm b/lib/CPAN.pm
b84bcc
index 6096916..4dc4e0b 100644
b84bcc
--- a/lib/CPAN.pm
b84bcc
+++ b/lib/CPAN.pm
b84bcc
@@ -1708,7 +1708,7 @@ restarting the whole get/make/test/install procedure from scratch.
b84bcc
 
b84bcc
 =item Lockfile
b84bcc
 
b84bcc
-Interactive sessions maintain a lockfile, by default C<~/.cpan/.lock>.
b84bcc
+Interactive sessions maintain a lockfile, by default C<~/.XCPANCONFIGNAMEX/.lock>.
b84bcc
 Batch jobs can run without a lockfile and not disturb each other.
b84bcc
 
b84bcc
 The shell offers to run in I<downgraded mode> when another process is
b84bcc
@@ -1782,7 +1782,7 @@ C<install_tested>.
b84bcc
 
b84bcc
 =head2 mkmyconfig
b84bcc
 
b84bcc
-mkmyconfig() writes your own CPAN::MyConfig file into your C<~/.cpan/>
b84bcc
+mkmyconfig() writes your own CPAN::MyConfig file into your C<~/.XCPANCONFIGNAMEX/>
b84bcc
 directory so that you can save your own preferences instead of the
b84bcc
 system-wide ones.
b84bcc
 
b84bcc
@@ -1993,7 +1993,7 @@ in a file CPAN/Config.pm.
b84bcc
 
b84bcc
 Default values defined in the CPAN/Config.pm file can be
b84bcc
 overridden in a user specific file: CPAN/MyConfig.pm. Such a file is
b84bcc
-best placed in C<$HOME/.cpan/CPAN/MyConfig.pm>, because C<$HOME/.cpan> is
b84bcc
+best placed in C<$HOME/.XCPANCONFIGNAMEX/CPAN/MyConfig.pm>, because C<$HOME/.XCPANCONFIGNAMEX> is
b84bcc
 added to the search path of the CPAN module before the use() or
b84bcc
 require() statements. The mkmyconfig command writes this file for you.
b84bcc
 
b84bcc
@@ -3685,8 +3685,8 @@ there is too much output to keep track of.
b84bcc
 
b84bcc
 You may want to configure something like
b84bcc
 
b84bcc
-  o conf make_arg "| tee -ai /root/.cpan/logs/make.out"
b84bcc
-  o conf make_install_arg "| tee -ai /root/.cpan/logs/make_install.out"
b84bcc
+  o conf make_arg "| tee -ai /root/.XCPANCONFIGNAMEX/logs/make.out"
b84bcc
+  o conf make_install_arg "| tee -ai /root/.XCPANCONFIGNAMEX/logs/make_install.out"
b84bcc
 
b84bcc
 so that STDOUT is captured in a file for later inspection.
b84bcc
 
b84bcc
diff --git a/lib/CPAN/HandleConfig.pm b/lib/CPAN/HandleConfig.pm
b84bcc
index e596cbc..dcd2255 100644
b84bcc
--- a/lib/CPAN/HandleConfig.pm
b84bcc
+++ b/lib/CPAN/HandleConfig.pm
b84bcc
@@ -537,7 +537,7 @@ sub cpan_home_dir_candidates {
b84bcc
     push @dirs, $ENV{USERPROFILE} if $ENV{USERPROFILE};
b84bcc
 
b84bcc
     $CPAN::Config->{load_module_verbosity} = $old_v;
b84bcc
-    my $dotcpan = $^O eq 'VMS' ? '_cpan' : '.cpan';
b84bcc
+    my $dotcpan = $^O eq 'VMS' ? '_XCPANCONFIGNAMEX' : '.XCPANCONFIGNAMEX';
b84bcc
     @dirs = map { File::Spec->catdir($_, $dotcpan) } grep { defined } @dirs;
b84bcc
     return wantarray ? @dirs : $dirs[0];
b84bcc
 }
b84bcc
diff --git a/scripts/cpan-mirrors b/scripts/cpan-mirrors
b84bcc
index fe0e29c..493c140 100644
b84bcc
--- a/scripts/cpan-mirrors
b84bcc
+++ b/scripts/cpan-mirrors
b84bcc
@@ -143,7 +143,7 @@ to your configuration.
b84bcc
 
b84bcc
 If you don't have a F<MIRRORED.BY> file, this program will download one
b84bcc
 for you. It looks through your existing C<urllist> configuration and
b84bcc
-then default locations. It stores it in C<~/.cpan> (or your configured
b84bcc
+then default locations. It stores it in C<~/.XCPANCONFIGNAMEX> (or your configured
b84bcc
 location to store files).
b84bcc
 
b84bcc
 =head1 TO DO
b84bcc
-- 
b84bcc
2.1.0
b84bcc