Changeset 1926

Timestamp:

06/11/2007 23:25:48 (14 months ago)

Author:

chris

Message:

Ensure that restore failure sets the return code from bbackupquery, so
that symlink following test fails.

Files:

• box/trunk/bin/bbackupquery/BackupQueries.cpp (modified) (5 diffs)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -2029 +2029 @@
         {
                 BOX_ERROR("Failed to restore: " << e.what());
+                SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
         }
@@ -2034 +2035 @@
         {
                 BOX_ERROR("Failed to restore: unknown exception");
+                SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
         }
@@ -2045 +2047 @@
         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;
                 
@@ -2056 +2060 @@
                         "To restore to a directory whose parent "
                         "does not exist, create the parent first.");
+                SetReturnCode(COMMAND_RETURN_ERROR);
                 break;
         #endif
@@ -2061 +2066 @@
         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;
         }