Skip to content

Commit 4c89190

Browse files
authored
Merge pull request #7161 from fstagni/81_fixes13
[8.1] hackathon fixes
2 parents b81fe10 + eb6e08b commit 4c89190

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/DIRAC/FrameworkSystem/Client/ComponentInstaller.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ def addDefaultOptionsToCS(
674674
"""
675675
Add the section with the component options to the CS
676676
"""
677-
if mySetup is None:
677+
if not mySetup:
678678
mySetup = self.setup
679679

680680
if gConfig_o:
@@ -2403,7 +2403,7 @@ def installTornado(self):
24032403
os.chmod(runFile, self.gDefaultPerms)
24042404

24052405
except Exception:
2406-
error = "Failed to prepare self.setup forTornado"
2406+
error = "Failed to prepare self.setup for Tornado"
24072407
gLogger.exception(error)
24082408
if self.exitOnError:
24092409
DIRAC.exit(-1)

src/DIRAC/FrameworkSystem/Client/SystemAdministratorClientCLI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ def do_install(self, args):
738738
system,
739739
component,
740740
extensionsByPriority(),
741-
specialOptions,
741+
specialOptions=specialOptions,
742742
addDefaultOptions=True,
743743
)
744744
else:

src/DIRAC/WorkloadManagementSystem/ConfigTemplate.cfg

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ Services
2626
Authorization
2727
{
2828
Default = authenticated
29-
sendMessage = "Operator"
30-
sendMessage += "GenericPilot"
31-
getMetadata = "Operator"
32-
getMetadata += "TrustedHost"
33-
finaliseLogs = "Operator"
34-
finaliseLogs += "Pilot"
35-
finaliseLogs += "GenericPilot"
29+
sendMessage = Operator
30+
sendMessage += GenericPilot
31+
getMetadata = Operator
32+
getMetadata += TrustedHost
33+
finaliseLogs = Operator
34+
finaliseLogs += Pilot
35+
finaliseLogs += GenericPilot
3636
}
3737
}
3838
##END

0 commit comments

Comments
 (0)