emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2016-07-07-improve-thin-repair-error-message' into v0.7-devel

Browse Source 
Conflicts:
	Makefile.in
	VERSION
	configure.ac
	persistent-data/file_utils.cc
This commit is contained in:
Joe Thornber
2016-07-11 15:51:30 +01:00
parent a3eac8d5d8 4779fb9b80
commit c2fdbad322
17 changed files with 131 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
caching/cache_repair.cc
View File

@@ -2,6 +2,7 @@
#include <getopt.h>
#include <libgen.h>
#include "base/output_file_requirements.h"
#include "caching/commands.h"
#include "caching/metadata.h"
#include "caching/metadata_dump.h"
@@ -105,7 +106,10 @@ cache_repair_cmd::run(int argc, char **argv)
return 1;
}
if (!output_path) {
if (output_path)
check_output_file_requirements(*output_path);
else {
cerr << "no output file provided" << endl;
usage(cerr);
return 1;

6
caching/cache_restore.cc
View File

@@ -1,5 +1,6 @@
#include "version.h"
#include "base/output_file_requirements.h"
#include "caching/commands.h"
#include "caching/metadata.h"
#include "caching/restore_emitter.h"
@@ -169,7 +170,10 @@ cache_restore_cmd::run(int argc, char **argv)
return 1;
}
if (!fs.output) {
if (fs.output)
check_output_file_requirements(*fs.output);
else {
cerr << "No output file provided." << endl << endl;
usage(cerr);
return 1;