1 | 98c98,106 |
---|
2 | < return -code error "Image error: Another version of $iname (${iversion}_${irevision}${ivariants}) is already active." |
---|
3 | --- |
---|
4 | > # if the force option was given, deactivate the existing version first |
---|
5 | > if { $force } { |
---|
6 | > # if the deactivation fails, pass on the error message |
---|
7 | > if {[catch {deactivate $iname ${iversion}_${irevision} $optionslist} result]} { |
---|
8 | > return -code error $result |
---|
9 | > } |
---|
10 | > } else { |
---|
11 | > return -code error "Image error: Another version of $iname (${iversion}_${irevision}${ivariants}) is already active." |
---|
12 | > } |
---|