Module: 'modules/fallback' nicht mehr in @INC aufnehmen

diff --git a/dispatcher.pl b/dispatcher.pl
index e5621f6f5cb0f2d69fad5d743dbdf283979dbb99..a6364ab83f26dfe2d7eeac29358b8337bc6b4ce7 100755 (executable)
--- a/dispatcher.pl
+++ b/dispatcher.pl
@@ -7,7 +7,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin);                       # '.' will be removed from @INC soon.
 
   unshift(@INC, $FindBin::Bin . '/modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin);                       # '.' will be removed from @INC soon.

-  push   (@INC, $FindBin::Bin . '/modules/fallback'); # Only use our own versions of modules if there's no system version.

 }
 
 use SL::Dispatcher;
 }
 
 use SL::Dispatcher;

diff --git a/scripts/dbconnect.pl b/scripts/dbconnect.pl
index 9ba492f5de5a365fd6bd15956ec93ad5c1ad57a7..734b030c4eca611480ad09d7923829851a709848 100755 (executable)
--- a/scripts/dbconnect.pl
+++ b/scripts/dbconnect.pl
@@ -5,7 +5,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.

-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.

 }
 
 use strict;
 }
 
 use strict;

diff --git a/scripts/dbupgrade2_tool.pl b/scripts/dbupgrade2_tool.pl
index 2231b119cd649cab83ef9e8bc5bd7f11cb42ff9c..77c9cb737956af07a1e107e7495725c36818b87f 100755 (executable)
--- a/scripts/dbupgrade2_tool.pl
+++ b/scripts/dbupgrade2_tool.pl
@@ -5,7 +5,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');

-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.

 }
 
 use strict;
 }
 
 use strict;

diff --git a/scripts/find-use.pl b/scripts/find-use.pl
index 61bfff751096c2060367bb7a373bbd4bf436f17e..c583ecc8eb9f612fcc953277cfb6aad43c014108 100755 (executable)
--- a/scripts/find-use.pl
+++ b/scripts/find-use.pl
@@ -5,7 +5,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.

-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.

 }
 
 use strict;
 }
 
 use strict;

diff --git a/scripts/installation_check.pl b/scripts/installation_check.pl
index 140ecddc036e932664feb587165fc595630deda0..fa608383924e1a3541c3276f8126b10841682a1b 100755 (executable)
--- a/scripts/installation_check.pl
+++ b/scripts/installation_check.pl
@@ -6,7 +6,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.

-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.

 
   # this is a default dir. may be wrong in your installation, change it then
   $master_templates = $FindBin::Bin . '/../templates/print/';
 
   # this is a default dir. may be wrong in your installation, change it then
   $master_templates = $FindBin::Bin . '/../templates/print/';

diff --git a/scripts/locales.pl b/scripts/locales.pl
index a4827b49165771c91a083417b7108a0e25143a17..8faea2148592301b4c35ed7630455d0750d9723a 100755 (executable)
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@ -14,7 +14,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');

-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.

 }
 
 use Carp;
 }
 
 use Carp;

diff --git a/scripts/rose_auto_create_model.pl b/scripts/rose_auto_create_model.pl
index 111b0c7a4695b69ad066ac39761e516f09299a02..5a0f7c23ca35bdf44bb855293ce88c9e2d10ee87 100755 (executable)
--- a/scripts/rose_auto_create_model.pl
+++ b/scripts/rose_auto_create_model.pl
@@ -7,7 +7,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.

-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.

 }
 
 use CGI qw( -no_xhtml);
 }
 
 use CGI qw( -no_xhtml);

diff --git a/scripts/sync_files_from_backend.pl b/scripts/sync_files_from_backend.pl
index 2c361483fc61e64549c3946efbd829e913446622..b3b0c2c6847790a7d21c21c4e05a7d952760bf3f 100755 (executable)
--- a/scripts/sync_files_from_backend.pl
+++ b/scripts/sync_files_from_backend.pl
@@ -1,13 +1,15 @@
 #!/usr/bin/perl
 
 BEGIN {
 #!/usr/bin/perl
 
 BEGIN {

+  use FindBin;
+

   if (! -d "bin" || ! -d "SL") {
     print("This tool must be run from the kivitendo ERP base directory.\n");
     exit(1);
   }
 
   if (! -d "bin" || ! -d "SL") {
     print("This tool must be run from the kivitendo ERP base directory.\n");
     exit(1);
   }
 

-  unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
-  push    @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
+  unshift @INC, $FindBin::Bin . '/../modules/override'; # Use our own versions of various modules (e.g. YAML).
+  push    @INC, $FindBin::Bin . '/..';

 }
 
 
 }
 
 

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index fcdef49296fbae2c0316d5e539d7cc46e55669ba..3674eac768114130f3e07050a1751aa1eb665b24 100755 (executable)
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -9,7 +9,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.

-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.

 }
 
 use CGI qw( -no_xhtml);
 }
 
 use CGI qw( -no_xhtml);

diff --git a/t/001compile.t b/t/001compile.t
index 0d1657b191c00ad55231f6fb370033550c42575a..044d6040814d1bfd9393c07ad2b71cbdefb794bc 100644 (file)
--- a/t/001compile.t
+++ b/t/001compile.t
@@ -70,7 +70,7 @@ sub test_compile_file {
   my ($file, $T) = @{ $_[0] };
 
 
   my ($file, $T) = @{ $_[0] };
 
 

-  my $command = "$perlapp -w -c$T -Imodules/fallback -Imodules/override -It -MSupport::CanonialGlobals $file 2>&1";
+  my $command = "$perlapp -w -c$T -Imodules/override -It -MSupport::CanonialGlobals $file 2>&1";

   my $loginfo=`$command`;
 
   if ($loginfo =~ /syntax ok$/im) {
   my $loginfo=`$command`;
 
   if ($loginfo =~ /syntax ok$/im) {

diff --git a/t/request/post_multipart.t b/t/request/post_multipart.t
index bdec8a4ade84d1b4ef5d9361b7991225ccec5b8a..bae6a43cc82120aa50908a72884c08facddfb31d 100644 (file)
--- a/t/request/post_multipart.t
+++ b/t/request/post_multipart.t
@@ -2,7 +2,6 @@ use strict;
 use utf8;
 
 use lib 't';
 use utf8;
 
 use lib 't';

-use lib 'modules/fallback';

 BEGIN {
   unshift @INC, 'modules/override';
 }
 BEGIN {
   unshift @INC, 'modules/override';
 }


@@ -104,4 +103,3 @@ is_deeply $tt,
           'action' => 'CsvImport/dispatch',
           'FILENAME' => 'from_wikipedia.csv'
         };
           'action' => 'CsvImport/dispatch',
           'FILENAME' => 'from_wikipedia.csv'
         };

-

diff --git a/t/test.pl b/t/test.pl
index dcc738b8b0ee33f74a98952fad6ff9fc5287732b..ccdab4077abc3f491dd0aabbb616e5ce0c172d8d 100755 (executable)
--- a/t/test.pl
+++ b/t/test.pl
@@ -12,7 +12,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.

-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.

 
   $ENV{HARNESS_OPTIONS} = 'c';
 
 
   $ENV{HARNESS_OPTIONS} = 'c';