texlive[45739] Master: switch from require TeXLive::JSON to require

[commits+preining at tug.org]

Revision: 45739
          http://tug.org/svn/texlive?view=revision&revision=45739
Author:   preining
Date:     2017-11-10 03:33:27 +0100 (Fri, 10 Nov 2017)
Log Message:
-----------
switch from require TeXLive::JSON to require JSON

Modified Paths:
--------------
    trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
    trunk/Master/tlpkg/TeXLive/TLPDB.pm
    trunk/Master/tlpkg/TeXLive/TLPOBJ.pm

Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2017-11-10 02:12:19 UTC (rev 45738)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2017-11-10 02:33:27 UTC (rev 45739)
@@ -582,7 +582,7 @@
   }
 
   if ($opts{'json'}) {
-    eval { require TeXLive::JSON; };
+    eval { require JSON; };
     if ($@) {
       # that didn't work out, give some usefull error message and stop
       if ($^O =~ /^MSWin/i) {
@@ -3673,7 +3673,7 @@
 }
 
 sub show_one_package_json {
-  require TeXLive::JSON;
+  require JSON;
   my ($p) = @_;
   my @out;
   my $loctlp = $localtlpdb->get_package($p);

Modified: trunk/Master/tlpkg/TeXLive/TLPDB.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPDB.pm	2017-11-10 02:12:19 UTC (rev 45738)
+++ trunk/Master/tlpkg/TeXLive/TLPDB.pm	2017-11-10 02:33:27 UTC (rev 45739)
@@ -479,7 +479,7 @@
 
 sub as_json {
   my $self = shift;
-  require TeXLive::JSON;
+  require JSON;
   my $ret = "{";
   if ($self->is_virtual) {
     my $firsttlpdb = 1;

Modified: trunk/Master/tlpkg/TeXLive/TLPOBJ.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPOBJ.pm	2017-11-10 02:12:19 UTC (rev 45738)
+++ trunk/Master/tlpkg/TeXLive/TLPOBJ.pm	2017-11-10 02:33:27 UTC (rev 45739)
@@ -423,7 +423,7 @@
 sub as_json {
   my $self = shift;
   my %addargs = @_;
-  require TeXLive::JSON;
+  require JSON;
   #my $json = JSON::PP->new->utf8;
   my %foo = %{$self};
   # set the additional args