Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 46e9355a

Von Moritz Bunkus vor etwa 5 Jahren hinzugefügt

  • ID 46e9355a07d3ba6e1ea1d95a893d6ed4c8b31487
  • Vorgänger 61a426f1
  • Nachfolger a5a81f46

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

Unterschiede anzeigen:

dispatcher.pl
7 7

  
8 8
  unshift(@INC, $FindBin::Bin . '/modules/override'); # Use our own versions of various modules (e.g. YAML).
9 9
  push   (@INC, $FindBin::Bin);                       # '.' will be removed from @INC soon.
10
  push   (@INC, $FindBin::Bin . '/modules/fallback'); # Only use our own versions of modules if there's no system version.
11 10
}
12 11

  
13 12
use SL::Dispatcher;
scripts/dbconnect.pl
5 5

  
6 6
  unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
7 7
  push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
8
  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
9 8
}
10 9

  
11 10
use strict;
scripts/dbupgrade2_tool.pl
5 5

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

  
11 10
use strict;
scripts/find-use.pl
5 5

  
6 6
  unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
7 7
  push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
8
  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
9 8
}
10 9

  
11 10
use strict;
scripts/installation_check.pl
6 6

  
7 7
  unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
8 8
  push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
9
  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
10 9

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

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

  
20 19
use Carp;
scripts/rose_auto_create_model.pl
7 7

  
8 8
  unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
9 9
  push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
10
  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
11 10
}
12 11

  
13 12
use CGI qw( -no_xhtml);
scripts/sync_files_from_backend.pl
1 1
#!/usr/bin/perl
2 2

  
3 3
BEGIN {
4
  use FindBin;
5

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

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

  
13 15

  
scripts/task_server.pl
9 9

  
10 10
  unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
11 11
  push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
12
  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
13 12
}
14 13

  
15 14
use CGI qw( -no_xhtml);
t/001compile.t
70 70
  my ($file, $T) = @{ $_[0] };
71 71

  
72 72

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

  
76 76
  if ($loginfo =~ /syntax ok$/im) {
t/request/post_multipart.t
2 2
use utf8;
3 3

  
4 4
use lib 't';
5
use lib 'modules/fallback';
6 5
BEGIN {
7 6
  unshift @INC, 'modules/override';
8 7
}
......
104 103
          'action' => 'CsvImport/dispatch',
105 104
          'FILENAME' => 'from_wikipedia.csv'
106 105
        };
107

  
t/test.pl
12 12

  
13 13
  unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
14 14
  push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
15
  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
16 15

  
17 16
  $ENV{HARNESS_OPTIONS} = 'c';
18 17

  

Auch abrufbar als: Unified diff