Merge branch 'master' into rm_hook

diff --git a/dss.c b/dss.c
index 7e23eaba947a6a7f58982736481b3b90d9b21821..6dbe11f6ba7e5fd3541a0364228b6fc81562b793 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -985,7 +985,7 @@ static int com_create(void)
                if (ret < 0)
                        return ret;
                ret = handle_pre_create_hook_exit(status);
-               if (ret < 0)
+               if (ret <= 0) /* error, or pre-create failed */
                        return ret;
        }
        create_rsync_argv(&rsync_argv, &current_snapshot_creation_time);