Skip to content

Commit 5f0dd38

Browse files
Merge pull request #221 from matyasselmeci/pr/SOFTWARE-4599.xrootd-multiuser
Use new config for newer versions of xrootd-multiuser
2 parents 8c3ac8f + 0c1d06b commit 5f0dd38

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

osgtest/tests/test_150_xrootd.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,11 @@ def test_02_configure_hdfs(self):
110110

111111
def test_03_configure_multiuser(self):
112112
core.skip_ok_unless_installed('xrootd-multiuser', 'globus-proxy-utils', by_dependency=True)
113-
xrootd_multiuser_conf = "xrootd.fslib libXrdMultiuser.so default"
113+
if core.PackageVersion("xrootd-multiuser") < "1.0.0-0":
114+
xrootd_multiuser_conf = "xrootd.fslib libXrdMultiuser.so default"
115+
else:
116+
xrootd_multiuser_conf = "ofs.osslib ++ libXrdMultiuser.so\n" \
117+
"ofs.ckslib ++ libXrdMultiuser.so"
114118
files.append(core.config['xrootd.config'], xrootd_multiuser_conf, owner='xrootd', backup=False)
115119
core.config['xrootd.multiuser'] = True
116120

0 commit comments

Comments
 (0)