From e040cac091db8020a60d5b3d40225e38a515d2ee Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Mon, 24 Aug 2015 10:57:12 +0400
Subject: [PATCH 1/3] =?UTF-8?q?Avec=20les=20fonctions=20e*,=20afficher=20l?=
 =?UTF-8?q?e=20statut=20de=20fa=C3=A7on=20explicite=20en=20mode=20non=20co?=
 =?UTF-8?q?lor=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/ulib/base | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/ulib/base b/lib/ulib/base
index a1a2c92..ae4844f 100644
--- a/lib/ulib/base
+++ b/lib/ulib/base
@@ -2966,9 +2966,9 @@ function __indent() {
     fi
 }
 # fonctions à surcharger pour modifier la façon dont les messages sont affichés
-function __eerror() { tooenc "$(__edate)${__tlevel}E $(__indent "$1")"; }
-function __ewarn() { tooenc "$(__edate)${__tlevel}W $(__indent "$1")"; }
-function __enote() { tooenc "$(__edate)${__tlevel}N $(__indent "$1")"; }
+function __eerror() { tooenc "$(__edate)${__tlevel}ERROR $(__indent "$1")"; }
+function __ewarn() { tooenc "$(__edate)${__tlevel}WARNING $(__indent "$1")"; }
+function __enote() { tooenc "$(__edate)${__tlevel}NOTE $(__indent "$1")"; }
 function __ebanner() {
     local maxi="${COLUMNS:-80}"
     local -a lines
@@ -2990,12 +2990,12 @@ function __ebanner() {
     done
     tooenc "$psfix"
 }
-function __eimportant() { tooenc "$(__edate)${__tlevel}! $(__indent "$1")"; }
-function __eattention() { tooenc "$(__edate)${__tlevel}* $(__indent "$1")"; }
-function __einfo() { tooenc "$(__edate)${__tlevel}I $(__indent "$1")"; }
+function __eimportant() { tooenc "$(__edate)${__tlevel}IMPORTANT $(__indent "$1")"; }
+function __eattention() { tooenc "$(__edate)${__tlevel}ATTENTION $(__indent "$1")"; }
+function __einfo() { tooenc "$(__edate)${__tlevel}INFO $(__indent "$1")"; }
 function __eecho() { tooenc "$(__edate)${__tlevel}$(__indent "$1")"; }
 function __eecho_() { tooenc_ "$(__edate)${__tlevel}$(__indent "$1")"; }
-function __edebug() { tooenc "$(__edate)${__tlevel}D $(__indent "$1")"; }
+function __edebug() { tooenc "$(__edate)${__tlevel}DEBUG $(__indent "$1")"; }
 function __estep() { tooenc "$(__edate)${__tlevel}. $(__indent "$1")"; }
 function __estepe() { __estep "$@"; }
 function __estepw() { __estep "$@"; }
@@ -3006,7 +3006,7 @@ function __estepe_() { __estep_ "$@"; }
 function __estepw_() { __estep_ "$@"; }
 function __estepn_() { __estep_ "$@"; }
 function __estepi_() { __estep_ "$@"; }
-function __etitle() { tooenc "$(__edate)${__tlevel}T $(__indent "$1")"; }
+function __etitle() { tooenc "$(__edate)${__tlevel}=== $(__indent "$1")"; }
 function __ebegin() { tooenc_ "$(__edate)${__tlevel}. $(__indent "$1"): "; }
 function __edoto() { echo_ "."; }
 function __edotw() { echo_ "w"; }

From e356c2be9a702e26a9c1b6d1ffcbc2830f536d79 Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Mon, 24 Aug 2015 16:11:56 +0400
Subject: [PATCH 2/3] =?UTF-8?q?bug=20avec=20le=20calcul=20du=20syst=C3=A8m?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/ulib/sysinfos | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/ulib/sysinfos b/lib/ulib/sysinfos
index 7303798..1362ece 100644
--- a/lib/ulib/sysinfos
+++ b/lib/ulib/sysinfos
@@ -382,10 +382,8 @@ function check_sysinfos() {
                     if array_contains "$sysdistvar_" "$sysdist_"; then
                         r_=0
                         check_=skip
-                        break
+                        [ "$sysdist_" == "$value_" ] && break
                     elif [ "$sysdist_" == "$value_" ]; then
-                        r_=0
-                        check_=skip
                         break
                     fi
                 done
@@ -424,10 +422,8 @@ function check_sysinfos() {
                     if array_contains "$sysvervar_" "$sysver_"; then
                         r_=0
                         check_=skip
-                        break
+                        [ "$sysver_" == "$value_" ] && break
                     elif [ "$sysver_" == "$value_" ]; then
-                        r_=0
-                        check_=skip
                         break
                     fi
                 done

From 492180543d9c8ecbea9af79af9f409bdf20675ef Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Mon, 24 Aug 2015 16:12:07 +0400
Subject: [PATCH 3/3] Init changelog & version 2.12.1

---
 CHANGES.txt | 5 +++++
 VERSION.txt | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c13c97f..41dadf4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+## Version 2.12.1 du 24/08/2015-16:12
+
+e356c2b bug avec le calcul du système
+e040cac Avec les fonctions e*, afficher le statut de façon explicite en mode non coloré
+
 ## Version 2.12.0 du 23/08/2015-22:57
 
 dcb85ac Améliorer le déploiement uinst:rsync avec préfixes pour les hôtes distants
diff --git a/VERSION.txt b/VERSION.txt
index d8b6989..3cf561c 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-2.12.0
+2.12.1