diff options
| author | Norbert Preining <preining@logic.at> | 2017-11-10 02:33:27 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2017-11-10 02:33:27 +0000 |
| commit | 010655bf0ecc7e58f873031aed3ada8cca584fa8 (patch) | |
| tree | 5039c0b870db52bd63f4dfaefebaedb70f52c4e6 /Master | |
| parent | e633ac5b5e62e7a36d63f8fb90bf10e9d560259e (diff) | |
switch from require TeXLive::JSON to require JSON
git-svn-id: svn://tug.org/texlive/trunk@45739 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
| -rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 4 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 2 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPOBJ.pm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index 3d45319cd5c..d266ddea84a 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -582,7 +582,7 @@ for the full story.\n"; } 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 { } sub show_one_package_json { - require TeXLive::JSON; + require JSON; my ($p) = @_; my @out; my $loctlp = $localtlpdb->get_package($p); diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index 514e7965219..9176a04e715 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -479,7 +479,7 @@ the tag of the sub-database, and C<tlpdb> giving the JSON of the database. sub as_json { my $self = shift; - require TeXLive::JSON; + require JSON; my $ret = "{"; if ($self->is_virtual) { my $firsttlpdb = 1; diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index 75bcc33491c..8dadf1723fd 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -423,7 +423,7 @@ sub writeout_simple { 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 |