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

new policy: conflict between test versions and explicit versions, still no conflict between test versions and implicit loaded versions with +

Browse Source
This commit is contained in:
zimoch
2015-09-14 17:40:02 +02:00
parent fec8c28f25
commit 9ffd34e930
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
require.c
+5 -3
View File
@@ -468,7 +468,10 @@ static int compareVersions(const char* request, const char* found)
{
if (requireDebug)
printf("require: compareVersions: TESTVERS numeric requested, test version found\n");
return TESTVERS;
if(request[strlen(request)-1] == '+')
return TESTVERS;
else
return MISMATCH;
}
if (found_major < req_major)
{
@@ -868,8 +871,7 @@ static int require_priv(const char* module, const char* version, const char* arg
printf ("Module %s version %s already loaded\n", module, loaded);
break;
default:
printf("Conflict between requested %s version %s\n"
"and already loaded version %s.\n",
printf("Conflict between requested %s version %s and already loaded version %s.\n",
module, version, loaded);
return -1;
}