projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
61a426f
)
Module: 'modules/fallback' nicht mehr in @INC aufnehmen
author
Moritz Bunkus
<m.bunkus@linet-services.de>
Wed, 3 Apr 2019 12:29:38 +0000
(14:29 +0200)
committer
Moritz Bunkus
<m.bunkus@linet-services.de>
Wed, 3 Apr 2019 12:29:38 +0000
(14:29 +0200)
12 files changed:
dispatcher.pl
patch
|
blob
|
history
scripts/dbconnect.pl
patch
|
blob
|
history
scripts/dbupgrade2_tool.pl
patch
|
blob
|
history
scripts/find-use.pl
patch
|
blob
|
history
scripts/installation_check.pl
patch
|
blob
|
history
scripts/locales.pl
patch
|
blob
|
history
scripts/rose_auto_create_model.pl
patch
|
blob
|
history
scripts/sync_files_from_backend.pl
patch
|
blob
|
history
scripts/task_server.pl
patch
|
blob
|
history
t/001compile.t
patch
|
blob
|
history
t/request/post_multipart.t
patch
|
blob
|
history
t/test.pl
patch
|
blob
|
history
diff --git
a/dispatcher.pl
b/dispatcher.pl
index
e5621f6
..
a6364ab
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
9ba492f
..
734b030
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
2231b11
..
77c9cb7
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
61bfff7
..
c583ecc
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
140ecdd
..
fa60838
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
a4827b4
..
8faea21
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
111b0c7
..
5a0f7c2
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
2c36148
..
b3b0c2c
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
fcdef49
..
3674eac
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
0d1657b
..
044d604
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
bdec8a4
..
bae6a43
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
dcc738b
..
ccdab40
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';