bug fix for centos8/python3 in sat init

diff --git a/commands/config.py b/commands/config.py
index 744cb5aa292fc336846c2e8cbc5abb8239213597..927a889ddc44e285bd60f1b4c455f39eceef736f 100644 (file)
--- 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 a5b448fce18e6dc47120c0ea10f4ba99a1b01965..d235fb9f1cd5fe9af23f4a03acd02a85c1304a07 100644 (file)
--- 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 7755af0b81ad5dc0712286e6f49ca3eaa3d520e8..24ee9ebec4a3ac1a969c9399cd81270e5efed655 100644 (file)
--- 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 7755af0b81ad5dc0712286e6f49ca3eaa3d520e8..24ee9ebec4a3ac1a969c9399cd81270e5efed655 100644 (file)
--- 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 :
   {