[Box Backup-commit] COMMIT r1966 - box/chris/general/bin/bbackupquery

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2007-12-08 22:37:56 +0000 (Sat, 08 Dec 2007)
New Revision: 1966

Modified:
   box/chris/general/bin/bbackupquery/BackupQueries.cpp
Log:
Ensure that restore failure sets the return code from bbackupquery, so
that symlink following test fails. (merges [1926])


Modified: box/chris/general/bin/bbackupquery/BackupQueries.cpp
===================================================================
--- box/chris/general/bin/bbackupquery/BackupQueries.cpp	2007-12-08 22:34:42 UTC (rev 1965)
+++ box/chris/general/bin/bbackupquery/BackupQueries.cpp	2007-12-08 22:37:56 UTC (rev 1966)
@@ -2028,11 +2028,13 @@
 	catch(std::exception &e)
 	{
 		BOX_ERROR("Failed to restore: " << e.what());
+		SetReturnCode(COMMAND_RETURN_ERROR);
 		return;
 	}
 	catch(...)
 	{
 		BOX_ERROR("Failed to restore: unknown exception");
+		SetReturnCode(COMMAND_RETURN_ERROR);
 		return;
 	}
 
@@ -2044,10 +2046,12 @@
 	
 	case Restore_ResumePossible:
 		BOX_ERROR("Resume possible -- repeat command with -r flag to resume");
+		SetReturnCode(COMMAND_RETURN_ERROR);
 		break;
 	
 	case Restore_TargetExists:
 		BOX_ERROR("The target directory exists. You cannot restore over an existing directory.");
+		SetReturnCode(COMMAND_RETURN_ERROR);
 		break;
 		
 	#ifdef WIN32
@@ -2055,15 +2059,18 @@
 		BOX_ERROR("The target directory path does not exist.\n"
 			"To restore to a directory whose parent "
 			"does not exist, create the parent first.");
+		SetReturnCode(COMMAND_RETURN_ERROR);
 		break;
 	#endif
 
 	case Restore_UnknownError:
 		BOX_ERROR("Unknown error during restore.");
+		SetReturnCode(COMMAND_RETURN_ERROR);
 		break;
 
 	default:
 		BOX_ERROR("Unknown restore result " << result << ".");
+		SetReturnCode(COMMAND_RETURN_ERROR);
 		break;
 	}
 }