summaryrefslogtreecommitdiff
path: root/Master/texmf
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-08-28 15:24:25 +0000
committerNorbert Preining <preining@logic.at>2009-08-28 15:24:25 +0000
commit851cb2a4e504afedbd698e2b2aaed0f94953ec36 (patch)
tree3ff4bebbcc286671401aede3fd44e394c0c89385 /Master/texmf
parentbbe77fb0508cdba63c4bb07beffca20e61ac099e (diff)
fix again some undef values in machine-readable output, and add
the size of packages on updates on update --list git-svn-id: svn://tug.org/texlive/trunk@14916 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl12
1 files changed, 9 insertions, 3 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index bad958b4281..c44e771c126 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1945,10 +1945,15 @@ sub action_update {
$donesize, $starttime);
}
if ($::machinereadable) {
- machine_line($pkg, $FLAG_AUTOINSTALL, "-", $mediatlp->revision, $sizes{$pkg}, $estrem, $esttot);
+ my @maargs = ($pkg, $FLAG_AUTOINSTALL, "-", $mediatlp->revision, $sizes{$pkg});
+ if (!$opts{"list"}) {
+ push @maargs, $estrem, $esttot;
+ }
+ machine_line(@maargs);
} else {
if ($opts{"list"}) {
- info("$pkg: local: <absent>, source: " . $mediatlp->revision . " (auto-install)\n");
+ my $kb = int($sizes{$pkg} / 1024) + 1;
+ info("$pkg (${kb}KB): local: <absent>, source: " . $mediatlp->revision . " (auto-install)\n");
} else {
info("[$currnr/$totalnr, $estrem/$esttot] auto-install: $pkg\n");
}
@@ -2007,7 +2012,8 @@ sub action_update {
if ($::machinereadable) {
machine_line($pkg, $FLAG_UPDATE, $rev, $mediarev, $sizes{$pkg});
} else {
- info("$pkg: local: $rev, source: $mediarev (update)\n");
+ my $kb = int($sizes{$pkg} / 1024) + 1;
+ info("$pkg (${kb}KB): local: $rev, source: $mediarev (update)\n");
}
$updated{$pkg} = 1;
next;