Changeset 368 for trunk

Timestamp:

10/22/18 12:16:12 (5 years ago)

Author:

bas

Message:

sara_nodes also displays NHC offline notes,

Location:

trunk

Files:

• CHANGES (modified) (1 diff)
• Makefile.rpm.in (modified) (1 diff)
• configure (modified) (13 diffs)
• configure.in (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• examples/sara_nodes.py.in (modified) (3 diffs)
• release.json (modified) (1 diff)
• src/PBSQuery.py (modified) (1 diff)

trunk/CHANGES

@@ +1 @@
+=========== 4.6.6
+ * PBSQuery do not parse simple values. else rendering of offline not
+   goes wrong.
+   Author: Bas van der Vlies
+
 =========== 4.6.4
  * Use system Python instead of environment Python.

trunk/Makefile.rpm.in

@@ -1 +1 @@
 PRODUCT=pbs_python
-VERSION=4.6.3
+VERSION=4.6.6
 RELEASE=1
 

trunk/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pbs-python 4.6.3.
+# Generated by GNU Autoconf 2.69 for pbs-python 4.6.6.
 #
 #
@@ -577 +577 @@
 PACKAGE_NAME='pbs-python'
 PACKAGE_TARNAME='pbs-python'
-PACKAGE_VERSION='4.6.3'
-PACKAGE_STRING='pbs-python 4.6.3'
+PACKAGE_VERSION='4.6.6'
+PACKAGE_STRING='pbs-python 4.6.6'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
@@ -619 +619 @@
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
@@ -684 +685 @@
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
@@ -936 +938 @@
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
@@ -1073 +1084 @@
                 datadir sysconfdir sharedstatedir localstatedir includedir \
                 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-                libdir localedir mandir
+                libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
@@ -1186 +1197 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pbs-python 4.6.3 to adapt to many kinds of systems.
+\`configure' configures pbs-python 4.6.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1226 +1237 @@
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
@@ -1247 +1259 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pbs-python 4.6.3:";;
+     short | recursive ) echo "Configuration of pbs-python 4.6.6:";;
    esac
   cat <<\_ACEOF
@@ -1319 +1331 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-pbs-python configure 4.6.3
+pbs-python configure 4.6.6
 generated by GNU Autoconf 2.69
 
@@ -1336 +1348 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pbs-python $as_me 4.6.3, which was
+It was created by pbs-python $as_me 4.6.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -2431 +2443 @@
 # values after options handling.
 ac_log="
-This file was extended by pbs-python $as_me 4.6.3, which was
+This file was extended by pbs-python $as_me 4.6.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -2484 +2496 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pbs-python config.status 4.6.3
+pbs-python config.status 4.6.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

trunk/configure.in

@@ -2 +2 @@
 
 AC_PREREQ([2.69])
-AC_INIT([pbs-python], [4.6.3])
+AC_INIT([pbs-python], [4.6.6])
 AC_CONFIG_SRCDIR([src/C++/pbs_wrap.cxx])
 

trunk/debian/changelog

@@ +1 @@
+pbs-python (4.6.6-1) UNRELEASED; urgency=medium
+
+  * Fixed a problem that "offline" notes were not displayed correctly 
+
+ -- Bas van der Vlies <bas.vandervlies@surfsara.nl>  Mon, 22 Oct 2018 10:59:55 +0200
+
 pbs-python (4.6.5-1) UNRELEASED; urgency=low
 

trunk/examples/sara_nodes.py.in

@@ -242 +242 @@
                 add_dict['date'] = None
 
+        elif len(note) == 1:
+            ## There is a note but not set by admin
+            add_dict['date'] = add_dict['date_add'] = add_dict['date_edit'] = add_dict['username'] = add_dict['ticket'] = ''
+            add_dict['note'] = ",".join(note)
         else:
             ## If there is no note, just set the variables with a empty string
@@ -308 +312 @@
                     w_ticket = 6
                 show_fields.append([w_ticket,'Ticket'])
+        if w_date > 0 or w_note > 0:
             show_fields.append([w_note,'Note'])
 
@@ -327 +332 @@
             elif w_ticket > 0:
                 show_line_fields.append([w_ticket,''])
+        if w_date > 0 or w_note > 0:
             show_line_fields.append([w_note,line['note']])
 

trunk/release.json

@@ -1 +1 @@
 {
-  "version": "4.6.5",
-  "changes": "fixed incorrect rendering when no tickets are specified",
+  "version": "4.6.6",
+  "changes": "PBSQuery do not parse simple values, offline note is now rendered properly",
   "state": "stable",
   "scope": "bug fixes",
-  "download": "ftp://ftp.surfsara.nl/pub/outgoing/pbs_python-4.6.5.tar.gz"
+  "download": "ftp://ftp.surfsara.nl/pub/outgoing/pbs_python-4.6.6.tar.gz"
 }

trunk/src/PBSQuery.py

@@ -200 +200 @@
 
                     new[key] = a.value
-
                 else:
                     # Don't split , between ()
                     values = [x[1] for x in REG_SPLIT_COMMA_BRACE.findall(a.value)]
+                    if len(values) == 1:
+                        values = [ a.value ]
 
                     # We must creat sub dicts, only for specified