Avoid changing Perl-global for UTF-8-encoded output in CLI

As mentioned in #5036 (review) this otherwise breaks outputting JSON.
os-autoinst · Mar 20, 2023 · 82343ca · 82343ca
1 parent 585dc24
commit 82343ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/OpenQA/CLI/schedule.pm b/lib/OpenQA/CLI/schedule.pm
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 package OpenQA::CLI::schedule;
+use Encode 'encode_utf8';
 use OpenQA::Jobs::Constants;
 use Mojo::Base 'OpenQA::Command', -signatures;
 use Mojo::Util qw(getopt);
 use Term::ANSIColor qw(colored);
-use open qw(:std :encoding(UTF-8));
 
 has description => 'Schedules a set of jobs (via "isos post" creating a schedule product)';
 has usage => sub { shift->extract_usage };
@@ -37,7 +37,7 @@ sub _monitor_jobs ($self, $client, $poll_interval, $job_ids, $job_results) {
             push @$job_results, $job->{result} // NONE;
             next;
         }
-        print "Job state of job ID $job_id: $job_state, waiting …\n";
+        print encode_utf8("Job state of job ID $job_id: $job_state, waiting …\n");
         sleep $poll_interval;
     }
 }

diff --git a/lib/OpenQA/Command.pm b/lib/OpenQA/Command.pm
@@ -4,14 +4,14 @@
 package OpenQA::Command;
 use Mojo::Base 'Mojolicious::Command', -signatures;
 
+use Encode 'encode_utf8';
 use Cpanel::JSON::XS ();
 use OpenQA::Client;
 use Mojo::IOLoop;
 use Mojo::Util qw(decode getopt);
 use Mojo::URL;
 use Mojo::File qw(path);
 use Term::ANSIColor qw(colored);
-use open qw(:std :encoding(UTF-8));
 
 my $JSON = Cpanel::JSON::XS->new->utf8->canonical->allow_nonref->allow_unknown->allow_blessed->convert_blessed
   ->stringify_infnan->escape_slash->allow_dupkeys->pretty;
@@ -115,7 +115,8 @@ sub retry_tx ($self, $client, $tx, $handle_args, $retries = undef, $delay = unde
         $tx = $client->start($tx);
         my $res_code = $tx->res->code // 0;
         return $self->handle_result($tx, $handle_args) unless $res_code =~ /50[23]/ && $retries > 0;
-        print "Request failed, hit error $res_code, retrying up to $retries more times after waiting …\n";
+        print encode_utf8(
+            "Request failed, hit error $res_code, retrying up to $retries more times after waiting …\n");
         sleep $delay;
     }
 }