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
update how RSpecVersion is used
[sfa.git]
/
sfa
/
rspecs
/
rspec_converter.py
diff --git
a/sfa/rspecs/rspec_converter.py
b/sfa/rspecs/rspec_converter.py
index
bb90b25
..
dd7fe1f
100755
(executable)
--- a/
sfa/rspecs/rspec_converter.py
+++ b/
sfa/rspecs/rspec_converter.py
@@
-10,9
+10,9
@@
class RSpecConverter:
@staticmethod
def to_sfa_rspec(in_rspec):
rspec = parse_rspec(in_rspec)
@staticmethod
def to_sfa_rspec(in_rspec):
rspec = parse_rspec(in_rspec)
- if rspec.
format
== 'sfa':
+ if rspec.
version['type']
== 'sfa':
return in_rspec
return in_rspec
- elif rspec.
format == 'pg
':
+ elif rspec.
version['type'] == 'protogeni
':
return PGRSpecConverter.to_sfa_rspec(in_rspec)
else:
return in_rspec
return PGRSpecConverter.to_sfa_rspec(in_rspec)
else:
return in_rspec
@@
-20,9
+20,9
@@
class RSpecConverter:
@staticmethod
def to_pg_rspec(in_rspec):
rspec = parse_rspec(in_rspec)
@staticmethod
def to_pg_rspec(in_rspec):
rspec = parse_rspec(in_rspec)
- if rspec.
format == 'pg':
+ if rspec.
version['type'] == 'protogeni':
return in_rspec
return in_rspec
- elif rspec.
format
== 'sfa':
+ elif rspec.
version['type']
== 'sfa':
return SfaRSpecConverter.to_pg_rspec(in_rspec)
else:
return in_rspec
return SfaRSpecConverter.to_pg_rspec(in_rspec)
else:
return in_rspec