From 4c90f6450c26668e8033c8a6b6b6b930221a7be9 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 23 Dec 2017 09:38:29 +0000
Subject: More verbosity reduction.

---
 lib/MGA/DrakISO/BuildRoot.pm | 2 +-
 lib/MGA/DrakISO/Loopback.pm  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/MGA/DrakISO/BuildRoot.pm b/lib/MGA/DrakISO/BuildRoot.pm
index 9f789a0..c762f50 100755
--- a/lib/MGA/DrakISO/BuildRoot.pm
+++ b/lib/MGA/DrakISO/BuildRoot.pm
@@ -205,7 +205,7 @@ sub copy_files_to {
         $dest = $root . '/' . $dest;
         mkdir_p($dest =~ m|/$| ? $dest : dirname($dest));
         my @sources = MGA::DrakISO::Utils::glob__($build->{settings}{config_root} . '/' . $source);
-        print STDERR "copying @sources to $dest\n";
+        print STDERR "copying @sources to $dest\n" if $::verbose > 1;
         cp_af(@sources, $dest);
         my $o_perm = $o_opts && $o_opts->{mode};
         chmod $o_perm, $dest if $o_perm;
diff --git a/lib/MGA/DrakISO/Loopback.pm b/lib/MGA/DrakISO/Loopback.pm
index a1157f2..ae86d52 100644
--- a/lib/MGA/DrakISO/Loopback.pm
+++ b/lib/MGA/DrakISO/Loopback.pm
@@ -52,12 +52,17 @@ our %loop_types;
             output_p($exclude_file, map { $root . "$_\n" }  grep { -e $root . $_ } @{$dir->{exclude} || []});
             my $sort = $build->{settings}{config_root} . '/' . $dir->{sort};
             my $squashfs4_comp = best_squashfs4_compression($build);
-            run_($squashfs4_comp ? 'mksquashfs' : 'mksquashfs3', $src, $dest,
+            run_($squashfs4_comp ? 'mksquashfs' : 'mksquashfs3',
+                 # unless/until we get a quiet option
+                 if_($::verbose < 2, '>', '/dev/null'),
+                 $src, $dest,
                  $squashfs4_comp ? ('-comp', $squashfs4_comp) : '-lzma',
                  '-noappend', '-b', '1048576',
                  #'-processors', 1,
                  '-ef', $exclude_file,
                  if_(-f $sort, '-sort', $sort),
+                 if_($::verbose > 2, '-info', '-progress'),
+                 if_($::verbose < 2, '-no-progress'),
             ) or die "unable to run mksquashfs\n";
             unlink $exclude_file;
         },
-- 
cgit v1.2.1