Changeset b0ecdb2 in flex_extract.git


Ignore:
Timestamp:
Mar 8, 2020, 2:49:02 PM (4 years ago)
Author:
anphi <anne.philipp@…>
Branches:
master, ctbto, dev
Children:
a54f79b
Parents:
f127aee (diff), 50f9ca6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'dev'
BUGFIX for ticket #263

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Source/Python/Mods/checks.py

    r0f89116 r50f9ca6  
    479479    '''
    480480    if queue in _config.QUEUES_LIST and \
    481             (not gateway or not destination or
    482              not ecuid or not ecgid):
    483         raise ValueError('\nEnvironment variables GATEWAY, DESTINATION, ECUID '
     481            (not ecuid or not ecgid):
     482        raise ValueError('\nEnvironment variables ECUID '
    484483                         'and ECGID were not set properly! \n '
    485484                         'Please check for existence of file "ECMWF_ENV" '
    486485                         'in the run directory!')
     486    elif queue in _config.QUEUES_LIST and \
     487             (not gateway or not destination):
     488        print('WARNING: Parameters GATEWAY and DESTINATION were '
     489              'not properly set for working on ECMWF server. \n'
     490              'There will be no transfer of output files to the '
     491              'local gateway server possible!')
    487492    return
    488493
  • Source/Python/install.py

    r0f89116 r50f9ca6  
    285285
    286286    if c.install_target and c.install_target != 'local':
    287         if not c.ecgid or not c.ecuid or \
    288            not c.gateway or not c.destination:
    289             print('Please enter your ECMWF user id and group id as well ' +
    290                   'as the \nname of the local gateway and the ectrans ' +
    291                   'destination ')
    292             print('with command line options --ecuid --ecgid \
    293                    --gateway --destination')
     287        if not c.ecgid or not c.ecuid:
     288            print('Please enter your ECMWF user id and group id '
     289                  ' with command line options --ecuid --ecgid')
    294290            print('Try "' + sys.argv[0].split('/')[-1] + \
    295291                  ' -h" to print usage information')
    296             print('Please consult ecaccess documentation or ECMWF user \
    297                    support for further details')
     292            print('Please consult ecaccess documentation or ECMWF user '
     293                  'support for further details.\n')
    298294            sys.exit(1)
    299 
     295        if not c.gateway or not c.destination:
     296            print('WARNING: Parameters GATEWAY and DESTINATION were '
     297                  'not properly set for working on ECMWF server. \n'
     298                  'There will be no transfer of output files to the '
     299                  'local gateway server possible!')
    300300        if not c.installdir:
    301301            c.installdir = '${HOME}'
  • setup.sh

    rf7b9666 r50f9ca6  
    3131ECGID='<groupID>'
    3232GATEWAY='<gatewayname>'
    33 DESTINATION='<name>@genericSftp'
     33DESTINATION='<username>@genericSftp'
    3434INSTALLDIR=None
    3535JOB_TEMPLATE=''
     
    5959if [ "$TARGET" == "ecgate" ] || [ "$TARGET" == "cca" ]; then
    6060  # check if necessary Parameters are set
    61   if [ -z "$ECUID" ] || [ -z "$ECGID" ] || [ -z "$GATEWAY" ] || [ -z "$DESTINATION" ]; then
    62     echo "ERROR: At least one of the following parameters are not set: ECUID, ECGID, GATEWAY, DESTINATION!"
     61  if [ -z "$ECUID" ] || [ -z "$ECGID" ] || [ "$ECUID" == "<username>" ] || [ "$ECGID" == "<groupID>" ] ; then
     62    echo "ERROR: At least one of the following parameters are not properly set: ECUID or ECGID!"
    6363    echo "EXIT WITH ERROR"
    6464    exit
    6565  else
    6666    parameterlist+=" --ecuid=$ECUID --ecgid=$ECGID --gateway=$GATEWAY --destination=$DESTINATION"
     67  fi
     68  if [ -z "$GATEWAY" ] || [ -z "$DESTINATION" ] || [ "$GATEWAY" == "<gatewayname>" ] || [ "$DESTINATION" == "<username>@genericSftp" ] ; then
     69    echo "WARNING: Not setting parameters GATEWAY and DESTINATION means there will be no file transfer to local gateway server."
    6770  fi
    6871fi
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG