git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virt-df: Disallow -h and --csv options together (RHBZ#600977).
[libguestfs.git]
/
tools
/
virt-df
diff --git
a/tools/virt-df
b/tools/virt-df
index
4aa1063
..
45b7869
100755
(executable)
--- a/
tools/virt-df
+++ b/
tools/virt-df
@@
-119,6
+119,8
@@
my $human;
Print sizes in human-readable format.
Print sizes in human-readable format.
+You are not allowed to use I<-h> and I<--csv> at the same time.
+
=cut
my $inodes;
=cut
my $inodes;
@@
-146,6
+148,9
@@
if ($version) {
exit
}
exit
}
+# RHBZ#600977
+die __"virt-df: cannot use -h and --csv options together\n" if $human && $csv;
+
# Open the guest handle.
if (@ARGV == 0) {
# Open the guest handle.
if (@ARGV == 0) {