Commit 8f181a5d authored by Jeannie Backer's avatar Jeannie Backer
Browse files

PROG: Updated error message to not append caught exception. References #2407 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6635 41f8697f-d340-4b68-9986-7bafba869bb8
parent fbfd2cbe

isis/src/galileo/apps/gllnims2isis/gllnims2isis.cpp

+3 −2
Original line number Diff line number Diff line
@@ -144,8 +144,9 @@ void importQubs(QString coreParamName, QString suffixParamName) { 
  catch(IException &e) {

    QString msg = "Input file [" + inFile.expanded() +

                 "] is not a valid PVL file.";

    cerr << msg  << e.toString() << endl;

    throw IException(e, IException::User, msg, _FILEINFO_);

    // not appending the caught exception to this message.

    // we were picking up non-utf8 characters in the message

    throw IException(IException::User, msg, _FILEINFO_);

  }

isis/src/galileo/apps/gllnims2isis/tsts/corrupt/Makefile

+12 −1
Original line number Diff line number Diff line
@@ -3,4 +3,15 @@ APPNAME = gllnims2isis 
include $(ISISROOT)/make/isismake.tsts



commands:

	if [[ `$(APPNAME) from=$(INPUT)/32i001cr.qub core=$(OUTPUT)/32i001cr_core.cub suffix=$(OUTPUT)/32i001cr_suffix.cub  2>> $(OUTPUT)/error.txt > /dev/null` ]]; then true; fi;
 
	if [[ `$(APPNAME) \

	         from=$(INPUT)/32i001cr.qub \

	         core=$(OUTPUT)/32i001cr_core.cub \

	         suffix=$(OUTPUT)/32i001cr_suffix.cub  \

	         2> $(OUTPUT)/error_temp.txt \

	         > /dev/null` ]]; \

	then \

	  true; \

	fi;



	$(SED) 's+\[/.*/input/+\[input/+' $(OUTPUT)/error_temp.txt > $(OUTPUT)/error.txt;

	$(RM) $(OUTPUT)/error_temp.txt;