lin-epics-modules/require
0
0
Fork 0
forked from epics_driver_modules/require
Code Pull Requests Activity

allow loaded test version

Browse Source
This commit is contained in:
zimoch
2007-10-03 12:15:12 +00:00
parent 018ca56885
commit e8d6c8df86
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
require.c
+9 -3
View File
@@ -123,7 +123,7 @@ int require(char* lib, char* version)
while (*e && !isspace((int)*e)) e++;
*e = 0;
printf ("%s depends on %s %s\n", lib, l, v);
if (require(buffer,v) != OK)
if (require(l, v) != OK)
{
fclose(depfile);
return ERROR;
@@ -178,6 +178,12 @@ int require(char* lib, char* version)
else
{
/* Library already loaded. Check Version. */
if (version && strcmp(loaded, "test") == 0)
{
printf("Warning: %s version is test where %s was requested\n",
lib, version);
return OK;
}
if (version && *version && strcmp(loaded, version) != 0)
{
/* non-numerical versions must match exactly
@@ -195,10 +201,10 @@ int require(char* lib, char* version)
|| (matches >= 2 && minor > lminor)
|| (matches > 2 && minor == lminor && patch > lpatch))
{
printf("Conflict between requested version %s\n"
printf("Conflict between requested %s version %s\n"
"and already loaded version %s.\n"
"Aborting startup stript.\n",
lib, loaded);
lib, version, loaded);
shellScriptAbort();
return ERROR;
}