diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-03-09 10:34:29 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-03-09 10:34:29 -0800 |
| commit | eda28eadc0e429150a6575f4de99ea6ea1101000 (patch) | |
| tree | 232d08d086cfcde66d8c6441e55b6d9bca425718 /scripts/install/install-image | |
| parent | 0dbc66ed17d3a18f540d24e3e143089a7dc26f1e (diff) | |
| parent | 2dab8bb6de2faefd3a9289647a150d04116d4500 (diff) | |
| download | vyatta-cfg-system-eda28eadc0e429150a6575f4de99ea6ea1101000.tar.gz vyatta-cfg-system-eda28eadc0e429150a6575f4de99ea6ea1101000.zip | |
Merge branch 'larkspur' of suva.vyatta.com:/git/vyatta-cfg-system into larkspur
Diffstat (limited to 'scripts/install/install-image')
| -rwxr-xr-x | scripts/install/install-image | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/install/install-image b/scripts/install/install-image index fd306aec..f717588b 100755 --- a/scripts/install/install-image +++ b/scripts/install/install-image @@ -211,9 +211,13 @@ else CURVER=$(get_cur_version) fi NEWVER=$(get_new_version) -if [ -z "$CURVER" ] || [ -z "$NEWVER" ]; then - fail_exit 'Cannot find release version.' +if [ -z "$CURVER" ] ; then + fail_exit 'Cannot find current release version.' fi +if [ -z "$NEWVER" ] ; then + fail_exit 'Cannot find new release version.' +fi + if [ "$CURVER" == "$NEWVER" ]; then fail_exit "Version \"$NEWVER\" is already installed." fi |