Merge pull request #277 from vincentcasseau/dev

CPlot - validCassiopee: load local DB for the DB admin cassiope

Cassiopee/CPlot/apps/validCassiopee.py

@@ -164,6 +164,10 @@ def set(self): pass
 #==============================================================================
 # Get installation paths of Cassiopee, Fast and all PModules
 #==============================================================================
+def isDBAdmin():
+    import getpass
+    return getpass.getuser() == "cassiope"
+
 def getInstallPaths():
     try:
         # Check installPath
@@ -1917,8 +1921,10 @@ def setGUITitleBar(loc='GLOBAL'):
         CTK.infoBulle(parent=UpdateButton,
                       text='Update tests (replace data base files).')
         CTK.infoBulle(parent=TextThreads, text='Number of threads.')
-        ierr = setupGlobal()  # Comparison is made against the global valid
-        if ierr == 1: setupLocal()  # Global valid does not exist, default back to local
+        if isDBAdmin(): setupLocal()  # Local valid for the DB admin 'cassiope'
+        else:
+            ierr = setupGlobal()  # Comparison is made against the global valid
+            if ierr == 1: setupLocal()  # Global valid does not exist, default back to local
         TK.mainloop()
     else:
         # --- Command line execution ---
@@ -1938,8 +1944,10 @@ def setGUITitleBar(loc='GLOBAL'):
         TextThreads = NoDisplayEntry()
         getThreads()
 
-        if os.access('/stck/cassiope/git/Cassiopee/', os.R_OK) and vcargs.global_db:
-            setupGlobal(loadSession=vcargs.loadSession)
+        if (os.access('/stck/cassiope/git/Cassiopee/', os.R_OK) and
+                vcargs.global_db and not (vcargs.update or isDBAdmin())):
+            ierr = setupGlobal(loadSession=vcargs.loadSession)
+            if ierr == 1: setupLocal()  # Global valid does not exist, default back to local
         else: setupLocal(loadSession=vcargs.loadSession)
         purgeSessionLogs(vcargs.purge)
         if vcargs.filters: