more adjustments for json output

git-svn-id: svn://tug.org/texlive/trunk@45546 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 9 insertions, 5 deletions

diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index 95c5adeffbf..1530c1a06c8 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -426,8 +426,16 @@ sub as_json {
   require JSON;
   #my $json = JSON::PP->new->utf8;
   my %foo = %{$self};
+  # set the additional args
+  for my $k (keys %addargs) {
+    if (defined($addargs{$k})) {
+      $foo{$k} = $addargs{$k};
+    } else {
+      delete($foo{$k});
+    }
+  }
   # make sure numbers are encoded as numbers
-  for my $k (qw/revision runsize docsize srcsize containersize
+  for my $k (qw/revision runsize docsize srcsize containersize lrev rrev
                 srccontainersize doccontainersize runcontainersize/) {
     $foo{$k} += 0 if exists($foo{$k});
   }
@@ -442,10 +450,6 @@ sub as_json {
       $foo{'relocated'} = $JSON::false;
     }
   }
-  # set the additional args
-  for my $k (keys %addargs) {
-    $foo{$k} = $addargs{$k};
-  }
   my $utf8_encoded_json_text = JSON::encode_json(\%foo); #  $json->encode(\%foo);
   return $utf8_encoded_json_text;
 }