Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/DIRAC/Core/scripts/dirac_platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,22 @@

__RCSID__ = "$Id$"

import sys
import argparse

parser = argparse.ArgumentParser(
description=__doc__,
formatter_class=argparse.RawDescriptionHelpFormatter)
parser.parse_known_args()

try:
from DIRAC.Core.Utilities.Platform import getPlatformString
except Exception:
import argparse
import platform
import os
import sys
import re
import subprocess

parser = argparse.ArgumentParser(
description=__doc__,
formatter_class=argparse.RawDescriptionHelpFormatter)
parser.parse_known_args()

# We need to patch python platform module. It does a string comparison for the libc versions.
# it fails when going from 2.9 to 2.10,
# the fix converts the version to a tuple and attempts a numeric comparison
Expand Down
11 changes: 6 additions & 5 deletions src/DIRAC/Core/scripts/dirac_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,18 @@

import argparse

parser = argparse.ArgumentParser(
description=__doc__,
formatter_class=argparse.RawDescriptionHelpFormatter)
parser.parse_known_args()

import DIRAC
from DIRAC.Core.Utilities.DIRACScript import DIRACScript


@DIRACScript()
def main():
parser = argparse.ArgumentParser(
description=__doc__,
formatter_class=argparse.RawDescriptionHelpFormatter,
)
parser.parse_known_args()

print(DIRAC.version)


Expand Down