From 105bcfbdb9edfd762887aafa0f9540c6e84d0231 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Thu, 25 Jun 2020 10:41:27 +0200 Subject: [PATCH 1/3] ComponentInstaller: allow underscores in installed components The previous split would drop things after an underscore in the installed components name (e.g., Bdii2CSAgent_GLUE2) --- FrameworkSystem/Client/ComponentInstaller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FrameworkSystem/Client/ComponentInstaller.py b/FrameworkSystem/Client/ComponentInstaller.py index d71901639d4..63baf94e43c 100644 --- a/FrameworkSystem/Client/ComponentInstaller.py +++ b/FrameworkSystem/Client/ComponentInstaller.py @@ -1130,7 +1130,7 @@ def getSetupComponents(self): for cType in self.componentTypes: if body.find('dirac-%s' % (cType)) != -1: - system, compT = component.split('_')[0:2] + system, compT = component.split('_', 1) if system not in resultDict[resultIndexes[cType]]: resultDict[resultIndexes[cType]][system] = [] resultDict[resultIndexes[cType]][system].append(compT) From 2661d6b625ec0a8b0c41251f53c7d9014c2654ec Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Thu, 25 Jun 2020 12:54:59 +0200 Subject: [PATCH 2/3] dirac-transformation-clean: fix use of position arguments allows calling the script with e.g., -ddd --- TransformationSystem/scripts/dirac-transformation-clean.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/TransformationSystem/scripts/dirac-transformation-clean.py b/TransformationSystem/scripts/dirac-transformation-clean.py index ddc63836010..452afc62078 100755 --- a/TransformationSystem/scripts/dirac-transformation-clean.py +++ b/TransformationSystem/scripts/dirac-transformation-clean.py @@ -5,7 +5,7 @@ from __future__ import print_function import sys -from DIRAC.Core.Base.Script import parseCommandLine +from DIRAC.Core.Base.Script import parseCommandLine, getPositionalArgs parseCommandLine() from DIRAC.TransformationSystem.Agent.TransformationCleaningAgent import TransformationCleaningAgent @@ -15,8 +15,7 @@ print('Usage: dirac-transformation-clean transID [transID] [transID]') sys.exit() else: - transIDs = [int( arg ) for arg in sys.argv[1:]] - + transIDs = [int(arg) for arg in getPositionalArgs()] agent = TransformationCleaningAgent( 'Transformation/TransformationCleaningAgent', 'Transformation/TransformationCleaningAgent', From b3bd16cfaa9dda967378e75518fa75e2bf843f98 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Thu, 25 Jun 2020 13:13:37 +0200 Subject: [PATCH 3/3] Transformation scripts: allow command line flags (e.g., -ddd) --- .../scripts/dirac-transformation-archive.py | 6 +++--- TransformationSystem/scripts/dirac-transformation-clean.py | 2 +- .../scripts/dirac-transformation-remove-output.py | 6 +++--- .../scripts/dirac-transformation-verify-outputdata.py | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/TransformationSystem/scripts/dirac-transformation-archive.py b/TransformationSystem/scripts/dirac-transformation-archive.py index 08afe90b0f3..9cd3018bff7 100755 --- a/TransformationSystem/scripts/dirac-transformation-archive.py +++ b/TransformationSystem/scripts/dirac-transformation-archive.py @@ -5,14 +5,14 @@ from __future__ import print_function import sys -from DIRAC.Core.Base.Script import parseCommandLine +from DIRAC.Core.Base.Script import parseCommandLine, getPositionalArgs parseCommandLine() -if len( sys.argv ) < 2: +if not getPositionalArgs(): print('Usage: dirac-transformation-archive transID [transID] [transID]') sys.exit() else: - transIDs = [int( arg ) for arg in sys.argv[1:]] + transIDs = [int(arg) for arg in getPositionalArgs()] from DIRAC.TransformationSystem.Agent.TransformationCleaningAgent import TransformationCleaningAgent from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient diff --git a/TransformationSystem/scripts/dirac-transformation-clean.py b/TransformationSystem/scripts/dirac-transformation-clean.py index 452afc62078..d9c5f5a48aa 100755 --- a/TransformationSystem/scripts/dirac-transformation-clean.py +++ b/TransformationSystem/scripts/dirac-transformation-clean.py @@ -11,7 +11,7 @@ from DIRAC.TransformationSystem.Agent.TransformationCleaningAgent import TransformationCleaningAgent from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient -if len( sys.argv ) < 2: +if not getPositionalArgs(): print('Usage: dirac-transformation-clean transID [transID] [transID]') sys.exit() else: diff --git a/TransformationSystem/scripts/dirac-transformation-remove-output.py b/TransformationSystem/scripts/dirac-transformation-remove-output.py index 332e91f7509..4f3d6353680 100755 --- a/TransformationSystem/scripts/dirac-transformation-remove-output.py +++ b/TransformationSystem/scripts/dirac-transformation-remove-output.py @@ -5,14 +5,14 @@ from __future__ import print_function import sys -from DIRAC.Core.Base.Script import parseCommandLine +from DIRAC.Core.Base.Script import parseCommandLine, getPositionalArgs parseCommandLine() -if len( sys.argv ) < 2: +if not getPositionalArgs(): print('Usage: dirac-transformation-remove-output transID [transID] [transID]') sys.exit() else: - transIDs = [int( arg ) for arg in sys.argv[1:]] + transIDs = [int(arg) for arg in getPositionalArgs()] from DIRAC.TransformationSystem.Agent.TransformationCleaningAgent import TransformationCleaningAgent from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient diff --git a/TransformationSystem/scripts/dirac-transformation-verify-outputdata.py b/TransformationSystem/scripts/dirac-transformation-verify-outputdata.py index c4a59a114c7..eaf6a20682e 100755 --- a/TransformationSystem/scripts/dirac-transformation-verify-outputdata.py +++ b/TransformationSystem/scripts/dirac-transformation-verify-outputdata.py @@ -5,14 +5,14 @@ from __future__ import print_function import sys -from DIRAC.Core.Base.Script import parseCommandLine +from DIRAC.Core.Base.Script import parseCommandLine, getPositionalArgs parseCommandLine() -if len( sys.argv ) < 2: +if not getPositionalArgs(): print('Usage: dirac-transformation-verify-outputdata transID [transID] [transID]') sys.exit() else: - transIDs = [int( arg ) for arg in sys.argv[1:]] + transIDs = [int(arg) for arg in getPositionalArgs()] from DIRAC.TransformationSystem.Agent.ValidateOutputDataAgent import ValidateOutputDataAgent from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient