Merge pull request #8024 from fstagni/cherry-pick-2-059fe497a-integration

[sweep:integration] Fix return code

Author: fstagni

src/DIRAC/FrameworkSystem/scripts/dirac_admin_get_proxy.py

@@ -13,11 +13,11 @@
 import os
 
 import DIRAC
-from DIRAC import gLogger, S_OK, S_ERROR
+from DIRAC import S_ERROR, S_OK, gLogger
+from DIRAC.ConfigurationSystem.Client.Helpers import Registry
 from DIRAC.Core.Base.Script import Script
 from DIRAC.Core.Security.DiracX import addTokenToPEM
 from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager
-from DIRAC.ConfigurationSystem.Client.Helpers import Registry
 
 
 class Params:

src/DIRAC/FrameworkSystem/scripts/dirac_admin_proxy_upload.py

@@ -9,8 +9,7 @@
 Example:
   $ dirac-admin-proxy-upload
 """
-import sys
-
+from DIRAC import exit as dExit
 from DIRAC.Core.Base.Script import Script
 from DIRAC.FrameworkSystem.Client.ProxyUpload import CLIParams, uploadProxy
 
@@ -25,8 +24,8 @@ def main():
     retVal = uploadProxy(cliParams)
     if not retVal["OK"]:
         print(retVal["Message"])
-        sys.exit(1)
-    sys.exit(0)
+        dExit(1)
+    dExit(0)
 
 
 if __name__ == "__main__":

src/DIRAC/FrameworkSystem/scripts/dirac_proxy_info.py

@@ -71,7 +71,7 @@ def main():
     Script.disableCS()
     Script.parseCommandLine()
 
-    from DIRAC import gLogger
+    from DIRAC import gLogger, exit as dExit
     from DIRAC.Core.Security.ProxyInfo import getProxyInfo, getProxyStepsInfo
     from DIRAC.Core.Security.ProxyInfo import formatProxyInfoAsString, formatProxyStepsInfoAsString
     from DIRAC.Core.Security import VOMS
@@ -87,7 +87,7 @@ def main():
     result = getProxyInfo(params.proxyLoc, not params.vomsEnabled)
     if not result["OK"]:
         gLogger.error(result["Message"])
-        sys.exit(1)
+        dExit(1)
     infoDict = result["Value"]
     gLogger.notice(formatProxyInfoAsString(infoDict))
     if not infoDict["isProxy"]:
@@ -101,12 +101,13 @@ def main():
 
     def invalidProxy(msg):
         gLogger.error("Invalid proxy:", msg)
-        sys.exit(1)
+        dExit(1)
 
     if params.uploadedInfo:
         result = gProxyManager.getUserProxiesInfo()
         if not result["OK"]:
             gLogger.error("Could not retrieve the uploaded proxies info", result["Message"])
+            dExit(1)
         else:
             uploadedInfo = result["Value"]
             if not uploadedInfo:
@@ -157,8 +158,6 @@ def invalidProxy(msg):
         except Exception as e:
             invalidProxy(f"Failed to access DiracX: {e}")
 
-    sys.exit(0)
-
 
 if __name__ == "__main__":
     main()

src/DIRAC/Interfaces/scripts/dirac_admin_list_users.py

@@ -45,6 +45,9 @@ def printUsersInGroup(group=False):
                 print("All users registered:")
             for username in result["Value"]:
                 print(f" {username}")
+        else:
+            print(result["Message"])
+            DIRAC.exit(1)
 
     def describeUsersInGroup(group=False):
         result = diracAdmin.csListUsers(group)
@@ -55,6 +58,9 @@ def describeUsersInGroup(group=False):
                 print("All users registered:")
             result = diracAdmin.csDescribeUsers(result["Value"])
             print(diracAdmin.pPrint.pformat(result["Value"]))
+        else:
+            print(result["Message"])
+            DIRAC.exit(1)
 
     for group in args:
         if "all" in args:
@@ -64,9 +70,6 @@ def describeUsersInGroup(group=False):
         else:
             describeUsersInGroup(group)
 
-    for error in errorList:
-        print("ERROR %s: %s" % error)
-
     DIRAC.exit(exitCode)
 
 

src/DIRAC/Interfaces/scripts/dirac_admin_pilot_summary.py

@@ -38,9 +38,7 @@ def main():
     diracAdmin = DiracAdmin()
 
     result = diracAdmin.getPilotSummary()
-    if result["OK"]:
-        DIRAC.exit(0)
-    else:
+    if not result["OK"]:
         print(result["Message"])
         DIRAC.exit(2)
 

src/DIRAC/Interfaces/scripts/dirac_dms_lfn_metadata.py

@@ -37,7 +37,6 @@ def main():
 
     dirac = Dirac()
     exitCode = 0
-    errorList = []
 
     if len(lfns) == 1:
         try:

src/DIRAC/Interfaces/scripts/dirac_framework_ping_service.py

@@ -78,7 +78,7 @@ def main():
         exitCode = 2
     elif not result["OK"]:
         print("ERROR: ", result["Message"])
-        exitCode = 2
+        exitCode = 1
 
     DIRAC.exit(exitCode)
 

src/DIRAC/Interfaces/scripts/dirac_wms_job_status.py

@@ -10,8 +10,9 @@
   $ dirac-wms-job-status 2
   JobID=2 Status=Done; MinorStatus=Execution Complete; Site=EELA.UTFSM.cl;
 """
-import os
 import datetime
+import os
+
 from DIRAC.Core.Base.Script import Script
 
 
@@ -28,7 +29,6 @@ def main():
     from DIRAC.Interfaces.API.Dirac import Dirac, parseArguments
 
     dirac = Dirac()
-    exitCode = 0
 
     jobs = []
     for key, value in sws:
@@ -58,12 +58,9 @@ def main():
             print("JobID=" + str(job), end=" ")
             for status in result["Value"][job].items():
                 print("%s=%s;" % status, end=" ")
-            print()
     else:
-        exitCode = 2
         print(f"ERROR: {result['Message']}")
-
-    DIRACExit(exitCode)
+        DIRACExit(2)
 
 
 if __name__ == "__main__":