From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Sat, 1 Oct 2011 02:35:04 +0000 (-0400)
Subject: get_version() now accepts an rspec version object
X-Git-Tag: sfa-1.1-1~168
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ab4200f72c5eadf09a7f5b8dfe30a18d3ff52753;p=sfa.git

get_version() now accepts an rspec version object
---

diff --git a/sfa/rspecs/version_manager.py b/sfa/rspecs/version_manager.py
index 019531ee..28474795 100644
--- a/sfa/rspecs/version_manager.py
+++ b/sfa/rspecs/version_manager.py
@@ -1,5 +1,6 @@
 import os
 from sfa.util.faults import InvalidRSpec
+from sfa.rspecs.rspec_version import BaseVersion 
 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) 
+        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)