fish: Fix 'more' command to work with any file.

[libguestfs.git] / tools / virt-df

diff --git a/tools/virt-df b/tools/virt-df
index b997691..45b7869 100755 (executable)
--- a/tools/virt-df
+++ b/tools/virt-df
@@ -119,6 +119,8 @@ my $human;
 
 Print sizes in human-readable format.
 
+You are not allowed to use I<-h> and I<--csv> at the same time.
+
 =cut
 
 my $inodes;
@@ -146,6 +148,9 @@ if ($version) {
     exit
 }
 
+# RHBZ#600977
+die __"virt-df: cannot use -h and --csv options together\n" if $human && $csv;
+
 # Open the guest handle.
 
 if (@ARGV == 0) {
@@ -163,7 +168,7 @@ if (@ARGV == 0) {
     # https://bugzilla.redhat.com/show_bug.cgi?id=538041
     @doms = grep { $_->get_id () != 0 } @doms;
 
-    my @domnames = map { $_->get_name () } @doms;
+    my @domnames = sort (map { $_->get_name () } @doms);
 
     if (@domnames) {
         print_title ();