Changeset 368


Ignore:
Timestamp:
10/22/18 12:16:12 (4 years ago)
Author:
bas
Message:

sara_nodes also displays NHC offline notes,

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/CHANGES

    r364 r368  
     1=========== 4.6.6
     2 * PBSQuery do not parse simple values. else rendering of offline not
     3   goes wrong.
     4   Author: Bas van der Vlies
     5
    16=========== 4.6.4
    27 * Use system Python instead of environment Python.
  • trunk/Makefile.rpm.in

    r360 r368  
    11PRODUCT=pbs_python
    2 VERSION=4.6.3
     2VERSION=4.6.6
    33RELEASE=1
    44
  • trunk/configure

    r363 r368  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for pbs-python 4.6.3.
     3# Generated by GNU Autoconf 2.69 for pbs-python 4.6.6.
    44#
    55#
     
    577577PACKAGE_NAME='pbs-python'
    578578PACKAGE_TARNAME='pbs-python'
    579 PACKAGE_VERSION='4.6.3'
    580 PACKAGE_STRING='pbs-python 4.6.3'
     579PACKAGE_VERSION='4.6.6'
     580PACKAGE_STRING='pbs-python 4.6.6'
    581581PACKAGE_BUGREPORT=''
    582582PACKAGE_URL=''
     
    619619oldincludedir
    620620includedir
     621runstatedir
    621622localstatedir
    622623sharedstatedir
     
    684685sharedstatedir='${prefix}/com'
    685686localstatedir='${prefix}/var'
     687runstatedir='${localstatedir}/run'
    686688includedir='${prefix}/include'
    687689oldincludedir='/usr/include'
     
    936938    silent=yes ;;
    937939
     940  -runstatedir | --runstatedir | --runstatedi | --runstated \
     941  | --runstate | --runstat | --runsta | --runst | --runs \
     942  | --run | --ru | --r)
     943    ac_prev=runstatedir ;;
     944  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
     945  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
     946  | --run=* | --ru=* | --r=*)
     947    runstatedir=$ac_optarg ;;
     948
    938949  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
    939950    ac_prev=sbindir ;;
     
    10731084                datadir sysconfdir sharedstatedir localstatedir includedir \
    10741085                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
    1075                 libdir localedir mandir
     1086                libdir localedir mandir runstatedir
    10761087do
    10771088  eval ac_val=\$$ac_var
     
    11861197  # This message is too long to be a string in the A/UX 3.1 sh.
    11871198  cat <<_ACEOF
    1188 \`configure' configures pbs-python 4.6.3 to adapt to many kinds of systems.
     1199\`configure' configures pbs-python 4.6.6 to adapt to many kinds of systems.
    11891200
    11901201Usage: $0 [OPTION]... [VAR=VALUE]...
     
    12261237  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
    12271238  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
     1239  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
    12281240  --libdir=DIR            object code libraries [EPREFIX/lib]
    12291241  --includedir=DIR        C header files [PREFIX/include]
     
    12471259if test -n "$ac_init_help"; then
    12481260  case $ac_init_help in
    1249      short | recursive ) echo "Configuration of pbs-python 4.6.3:";;
     1261     short | recursive ) echo "Configuration of pbs-python 4.6.6:";;
    12501262   esac
    12511263  cat <<\_ACEOF
     
    13191331if $ac_init_version; then
    13201332  cat <<\_ACEOF
    1321 pbs-python configure 4.6.3
     1333pbs-python configure 4.6.6
    13221334generated by GNU Autoconf 2.69
    13231335
     
    13361348running configure, to aid debugging if configure makes a mistake.
    13371349
    1338 It was created by pbs-python $as_me 4.6.3, which was
     1350It was created by pbs-python $as_me 4.6.6, which was
    13391351generated by GNU Autoconf 2.69.  Invocation command line was
    13401352
     
    24312443# values after options handling.
    24322444ac_log="
    2433 This file was extended by pbs-python $as_me 4.6.3, which was
     2445This file was extended by pbs-python $as_me 4.6.6, which was
    24342446generated by GNU Autoconf 2.69.  Invocation command line was
    24352447
     
    24842496ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    24852497ac_cs_version="\\
    2486 pbs-python config.status 4.6.3
     2498pbs-python config.status 4.6.6
    24872499configured by $0, generated by GNU Autoconf 2.69,
    24882500  with options \\"\$ac_cs_config\\"
  • trunk/configure.in

    r363 r368  
    22
    33AC_PREREQ([2.69])
    4 AC_INIT([pbs-python], [4.6.3])
     4AC_INIT([pbs-python], [4.6.6])
    55AC_CONFIG_SRCDIR([src/C++/pbs_wrap.cxx])
    66
  • trunk/debian/changelog

    r366 r368  
     1pbs-python (4.6.6-1) UNRELEASED; urgency=medium
     2
     3  * Fixed a problem that "offline" notes were not displayed correctly
     4
     5 -- Bas van der Vlies <bas.vandervlies@surfsara.nl>  Mon, 22 Oct 2018 10:59:55 +0200
     6
    17pbs-python (4.6.5-1) UNRELEASED; urgency=low
    28
  • trunk/examples/sara_nodes.py.in

    r367 r368  
    242242                add_dict['date'] = None
    243243
     244        elif len(note) == 1:
     245            ## There is a note but not set by admin
     246            add_dict['date'] = add_dict['date_add'] = add_dict['date_edit'] = add_dict['username'] = add_dict['ticket'] = ''
     247            add_dict['note'] = ",".join(note)
    244248        else:
    245249            ## If there is no note, just set the variables with a empty string
     
    308312                    w_ticket = 6
    309313                show_fields.append([w_ticket,'Ticket'])
     314        if w_date > 0 or w_note > 0:
    310315            show_fields.append([w_note,'Note'])
    311316
     
    327332            elif w_ticket > 0:
    328333                show_line_fields.append([w_ticket,''])
     334        if w_date > 0 or w_note > 0:
    329335            show_line_fields.append([w_note,line['note']])
    330336
  • trunk/release.json

    r366 r368  
    11{
    2   "version": "4.6.5",
    3   "changes": "fixed incorrect rendering when no tickets are specified",
     2  "version": "4.6.6",
     3  "changes": "PBSQuery do not parse simple values, offline note is now rendered properly",
    44  "state": "stable",
    55  "scope": "bug fixes",
    6   "download": "ftp://ftp.surfsara.nl/pub/outgoing/pbs_python-4.6.5.tar.gz"
     6  "download": "ftp://ftp.surfsara.nl/pub/outgoing/pbs_python-4.6.6.tar.gz"
    77}
  • trunk/src/PBSQuery.py

    r339 r368  
    200200
    201201                    new[key] = a.value
    202 
    203202                else:
    204203                    # Don't split , between ()
    205204                    values = [x[1] for x in REG_SPLIT_COMMA_BRACE.findall(a.value)]
     205                    if len(values) == 1:
     206                        values = [ a.value ]
    206207
    207208                    # We must creat sub dicts, only for specified
Note: See TracChangeset for help on using the changeset viewer.