texlive[45539] Master/texmf-dist/scripts/texlive/tlmgr.pl: fix

[commits+preining at tug.org]

Revision: 45539
          http://tug.org/svn/texlive?view=revision&revision=45539
Author:   preining
Date:     2017-10-14 10:32:09 +0200 (Sat, 14 Oct 2017)
Log Message:
-----------
fix undefined errors on checks

Modified Paths:
--------------
    trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl

Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2017-10-14 02:02:10 UTC (rev 45538)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2017-10-14 08:32:09 UTC (rev 45539)
@@ -1412,7 +1412,7 @@
   my $ret = $F_OK | $F_NOPOSTACTION;
   my @datafields;
   my $fmt = "list";
-  if ($opts{'data'} eq "json") {
+  if ($opts{'data'} && ($opts{'data'} eq "json")) {
     eval { require JSON; };
     if ($@) {
       # that didn't work out, give some usefull error message and stop
@@ -1461,8 +1461,12 @@
   }
   # we are still here, so $what is defined and neither collection nor scheme,
   # so assume the arguments are package names
-  if ($opts{'data'} ne "json") {
-    $fmt = ($opts{'data'} ? "csv" : "detail");
+  if ($opts{'data'}) {
+    if ($opts{'data'} ne "json") {
+      $fmt = "csv";
+    }
+  } else {
+    $fmt = "detail";
   }
   my @adds;
   if ($opts{'data'}) {