Commit e35d5ae8 authored by Adam Paquette's avatar Adam Paquette
Browse files

Fixed an error message in cube, allowing spiceinit to fail if using an ISIS2 cube. Fixes #2372.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6888 41f8697f-d340-4b68-9986-7bafba869bb8
parent b3a72dfd
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
# run spice init with default parameters only
APPNAME = spiceinit

include $(ISISROOT)/make/isismake.tsts

commands:
#    TEST A: Check that an isis2 cube fails to be read
	echo -e "Test Spiceinit with an isis2 cube:" > $(OUTPUT)/error_message.txt;
	if [ `$(APPNAME) \
	  from=$(INPUT)/isis2Truth.cub \
	  2>> $(OUTPUT)/error_message.txt > /dev/null` ]; \
	  then true; \
	fi;
 No newline at end of file
+2 −2
Original line number Diff line number Diff line
@@ -1972,9 +1972,9 @@ namespace Isis {
        reformatOldIsisLabel(m_labelFileName->expanded());
      }
      else {
        QString msg = "Can not open [" + m_labelFileName->original() + "]"
                      " because it is an ISIS2 cube.";
        cleanUp(false);
        QString msg = "Can not open old cube file format with write access [" +
                     m_labelFileName->original() + "]";
        throw IException(IException::Io, msg, _FILEINFO_);
      }
    }