git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2469032
)
get_version() now accepts an rspec version object
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Sat, 1 Oct 2011 02:35:04 +0000
(22:35 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Sat, 1 Oct 2011 02:35:04 +0000
(22:35 -0400)
sfa/rspecs/version_manager.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/version_manager.py
b/sfa/rspecs/version_manager.py
index
019531e
..
2847479
100644
(file)
--- a/
sfa/rspecs/version_manager.py
+++ b/
sfa/rspecs/version_manager.py
@@
-1,5
+1,6
@@
import os
from sfa.util.faults import InvalidRSpec
import os
from sfa.util.faults import InvalidRSpec
+from sfa.rspecs.rspec_version import BaseVersion
from sfa.util.sfalogging import logger
class VersionManager:
from sfa.util.sfalogging import logger
class VersionManager:
@@
-52,6
+53,8
@@
class VersionManager:
if num_parts > 2:
content_type = version_parts[2]
retval = self._get_version(type, version_num, content_type)
if num_parts > 2:
content_type = version_parts[2]
retval = self._get_version(type, version_num, content_type)
+ elif isinstance(version, BaseVersion):
+ return version
else:
logger.info("Unable to parse rspec version, using default")
retval = self._get_version(self.default_type, self.default_version_num)
else:
logger.info("Unable to parse rspec version, using default")
retval = self._get_version(self.default_type, self.default_version_num)