From: crouzet <nicolas.crouzet@cea.fr>
Date: Thu, 12 Mar 2020 08:12:42 +0000 (+0100)
Subject: bug fix for centos8/python3 in sat init
X-Git-Tag: 5.6.0~19
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d2c066880d078400995634d17d005d1a24606138;p=tools%2Fsat.git

bug fix for centos8/python3 in sat init
---

diff --git a/commands/config.py b/commands/config.py
index 744cb5a..927a889 100644
--- a/commands/config.py
+++ b/commands/config.py
@@ -309,7 +309,7 @@ class ConfigManager:
             cfg.LOCAL.archive_dir = os.path.abspath( osJoin(cfg.VARS.salometoolsway, "..", "ARCHIVES"))
 
         # if the sat tag was not set permanently by user
-        if cfg.LOCAL.tag == None:
+        if cfg.LOCAL.tag == "unknown":
             # get the tag with git, and store it
             sat_version=src.system.git_describe(cfg.VARS.salometoolsway) 
             if sat_version == False:
diff --git a/commands/package.py b/commands/package.py
index a5b448f..d235fb9 100644
--- a/commands/package.py
+++ b/commands/package.py
@@ -73,8 +73,8 @@ LOCAL_TEMPLATE = ("""#!/usr/bin/env python
     workdir : 'default'
     log_dir : 'default'
     archive_dir : 'default'
-    VCS : None
-    tag : None
+    VCS : 'unknown'
+    tag : 'unknown'
   }
 
 PROJECTS :
diff --git a/data/local.pyconf b/data/local.pyconf
index 7755af0..24ee9eb 100644
--- a/data/local.pyconf
+++ b/data/local.pyconf
@@ -5,8 +5,8 @@
     workdir : 'default'
     log_dir : 'default'
     archive_dir : 'default'
-    VCS : None
-    tag : None
+    VCS : 'unknown'
+    tag : 'unknown'
   }
   PROJECTS :
   {
diff --git a/data/local_original.pyconf b/data/local_original.pyconf
index 7755af0..24ee9eb 100644
--- a/data/local_original.pyconf
+++ b/data/local_original.pyconf
@@ -5,8 +5,8 @@
     workdir : 'default'
     log_dir : 'default'
     archive_dir : 'default'
-    VCS : None
-    tag : None
+    VCS : 'unknown'
+    tag : 'unknown'
   }
   PROJECTS :
   {