lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error message

Browse Source
This commit is contained in:
Laurent Destailleur 2017-03-25 17:05:27 +01:00
parent 7dd2a3b130
commit 3c9d336148
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/generate_filelist_xml.php
View File

@ -40,6 +40,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
* Main * Main
*/ */
$includecustom=0;
$includeconstants=array(); $includeconstants=array();
if (empty($argv[1])) if (empty($argv[1]))
@ -67,8 +68,6 @@ while ($i < $argc)
if (empty($includecustom)) if (empty($includecustom))
{ {
$includecustom=0;
if (DOL_VERSION != $release) if (DOL_VERSION != $release)
{ {
print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$release.')'."\n"; print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$release.')'."\n";
@ -80,7 +79,7 @@ else
{ {
if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release)) if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
{ {
print 'Error: When parameter "includecustom" is not set, version declared into ('.DOL_VERSION.') must be used with a suffix into "release" parmater (ex: '.DOL_VERSION.'-mydistrib).'."\n"; print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parmater (ex: '.DOL_VERSION.'-mydistrib).'."\n";
print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n"; print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
exit -1; exit -1;
} }