git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetic
[sfa.git]
/
sfa
/
rspecs
/
rspec_version.py
diff --git
a/sfa/rspecs/rspec_version.py
b/sfa/rspecs/rspec_version.py
index
4deb924
..
2cd1517
100644
(file)
--- a/
sfa/rspecs/rspec_version.py
+++ b/
sfa/rspecs/rspec_version.py
@@
-1,6
+1,9
@@
#!/usr/bin/python
from sfa.util.sfalogging import sfa_logger
#!/usr/bin/python
from sfa.util.sfalogging import sfa_logger
+
+DEFAULT_FORMAT='sfa'
+DEFAULT_VERSION_NUMBER=1
class RSpecVersion:
format = None
class RSpecVersion:
format = None
@@
-13,20
+16,24
@@
class RSpecVersion:
self.logger = sfa_logger()
self.parse_version(version_raw)
self.logger = sfa_logger()
self.parse_version(version_raw)
- def parse_version
(self, version_raw
):
+ def parse_version
_string(self, version_string
):
# version_raw is currently a string but will
# eventually be a struct.
try:
# version_raw is currently a string but will
# eventually be a struct.
try:
- format_split = version_
raw
.split(' ')
+ format_split = version_
string
.split(' ')
format, version = format_split[0].lower(), format_split[1]
except:
format, version = format_split[0].lower(), format_split[1]
except:
- self.logger.info("RSpecVersion: invalid rspec version: %s , using default" \
- % version_
raw
)
+ self.logger.info("RSpecVersion: invalid rspec version
string
: %s , using default" \
+ % version_
string
)
# invalid format. Just continue
# invalid format. Just continue
- format, version =
'sfa', '1'
+ format, version =
DEFAULT_FORMAT, DEFAULT_VERSION_NUMBER
self.format = format
self.version = version
self.format = format
self.version = version
-
+ def parse_version_struct(self, version_struct):
+ try:
+ pass
+ except:
+ format, version = DEFAULT_FORMAT, DEFAULT_VERSION_NUMBER