Merge pull request #142 from moetiker/patch-1

omniosorg · Nov 11, 2023 · 5efb8cd · 5efb8cd
2 parents 3e0c843 + 7a773aa
commit 5efb8cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/Zadm/Utils.pm b/lib/Zadm/Utils.pm
@@ -198,7 +198,7 @@ my $edit = sub($self, $config) {
     my $suf  = $self->gconf->{CONFIG}->{format} || 'json';
     my $fh   = File::Temp->new(SUFFIX => ".$suf", OPEN => 0);
     my $file = Mojo::File->new($fh->filename);
-    $file->spurt($config);
+    $file->spew($config);
 
     my $mtime = $file->stat->mtime;
 
@@ -330,7 +330,7 @@ sub edit($self, $zone, $prop = {}) {
                 # restoring the zone XML config since it was changed but something went wrong
                 if ($backmod && $backmod != $xml->stat->mtime) {
                     $self->log->warn('WARNING: restoring the zone config.');
-                    $xml->spurt($backcfg);
+                    $xml->spew($backcfg);
 
                     return 0;
                 }
@@ -385,7 +385,7 @@ sub edit($self, $zone, $prop = {}) {
                 # restoring the zone XML config since it was changed but something went wrong
                 if ($backmod && $backmod != $xml->stat->mtime) {
                     $self->log->warn('WARNING: restoring the zone config.');
-                    $xml->spurt($backcfg);
+                    $xml->spew($backcfg);
                 }
 
                 return 0;
@@ -433,7 +433,7 @@ sub getZfsProp($self, $ds, $prop = []) {
 
 sub getFileType($self, $data, $suffix = '') {
     my $f = Mojo::File->new(File::Temp->new($suffix ? (SUFFIX => $suffix) : ()));
-    $f->spurt($data);
+    $f->spew($data);
 
     return $self->readProc('file', [ '-b', $f ])->[0];
 }

diff --git a/lib/Zadm/Zone/base.pm b/lib/Zadm/Zone/base.pm
@@ -769,7 +769,7 @@ sub fw($self) {
         }
         else {
             # ipf requires a trailing newline
-            $f->spurt(join ("\n", @{$self->utils->getSTDIN}), "\n");
+            $f->spew(join ("\n", @{$self->utils->getSTDIN}), "\n");
         }
 
         return if !-f $f || $mtime == $f->stat->mtime;