Fix 2.6 incompatibility

This commit is contained in:
Todd Gamblin 2015-08-13 00:21:02 -07:00
parent a2b5b61e7f
commit c8f65c1530

View File

@ -46,14 +46,14 @@ def install(self, spec, prefix):
for fs in self.feature_sets:
if "+" + fs in spec:
if feature_set is not None:
tty.error("Only one feature set allowed, both {} and {} specified".format(
feature_set,
fs))
tty.error("Only one feature set allowed, both %s and %s specified"
% (feature_set, fs))
feature_set = fs
if '+gui' in spec:
if feature_set is not None:
if feature_set is not 'huge':
tty.error("+gui variant requires 'huge' feature set, {} was specified".format(feature_set))
tty.error("+gui variant requires 'huge' feature set, %s was specified"
% feature_set)
feature_set = 'huge'
if feature_set is None:
feature_set = 'normal'