Salome HOME
projects
/
modules
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d6dfd86
)
Fix Salome launch when there are config files named SalomeApprc.DEV.7 for instance
rbe/fix-version-id
SALOME_COEUR_V1_2
author
Renaud Barate
<renaud.barate@edf.fr>
Fri, 26 Jun 2015 08:55:18 +0000
(10:55 +0200)
committer
Renaud Barate
<renaud.barate@edf.fr>
Fri, 26 Jun 2015 08:55:18 +0000
(10:55 +0200)
bin/launchConfigureParser.py
patch
|
blob
|
history
diff --git
a/bin/launchConfigureParser.py
b/bin/launchConfigureParser.py
index 84e0408596e57b1579e0bc7a062e19f516ab27d4..39c3d22cbe50dee89ae6576aac1de58750373cec 100755
(executable)
--- a/
bin/launchConfigureParser.py
+++ b/
bin/launchConfigureParser.py
@@
-126,7
+126,13
@@
def version():
def version_id(fname):
major = minor = release = dev1 = dev2 = 0
vers = fname.split(".")
- if len(vers) > 0: major = int(vers[0])
+ if len(vers) > 0:
+ try:
+ major = int(vers[0])
+ except ValueError:
+ # If salome version given is DEV, the call to int('DEV') will fail with
+ # a ValueError exception
+ pass
try:
if len(vers) > 1: minor = int(vers[1])
except ValueError: