summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-12-21 00:28:16 +0000
committerNorbert Preining <preining@logic.at>2008-12-21 00:28:16 +0000
commitcd1178b3f12d28f670df3fb581ba636c6a308a2e (patch)
treedd08f6a4fd8c675fc7504c7a9b96e335d0fdff1d
parentf151a6d9db5f7dea5e55256d0a735ac3bd98cd10 (diff)
add end-of-header line and move delete downwards
git-svn-id: svn://tug.org/texlive/trunk@11662 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr2.pl44
1 files changed, 23 insertions, 21 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr2.pl b/Master/texmf/scripts/texlive/tlmgr2.pl
index 80485903891..cf0890f95bf 100755
--- a/Master/texmf/scripts/texlive/tlmgr2.pl
+++ b/Master/texmf/scripts/texlive/tlmgr2.pl
@@ -1446,27 +1446,6 @@ sub action_update {
tlwarn("tlmgr update: please specify a list of packages or --all.\n");
}
- #
- # we have to remove all the stuff before we install other packages
- # to support moving of files from one package to another.
- # remove the packages that have disappeared:
- for my $p (keys %removals) {
- if ($opts{"no-remove"}) {
- info("not removing $p due to -no-remove (removed on server)\n");
- } else {
- if ($::machinereadable) {
- # TODO version numbers
- machine_line($p, $FLAG_REMOVE, "-", "-");
- } else {
- info("remove $p (removed on server)\n");
- }
- }
- if (!($opts{"dry-run"} or $opts{"list"} or $opts{"no-remove"})) {
- merge_into(\%ret, &remove_package($p, $localtlpdb));
- logpackage("remove: $p");
- }
- }
-
# update all .ARCH dependencies, too, unless $opts{"no-depends-at-all"}:
@todo = $mediatlpdb->expand_dependencies("-only-arch", $localtlpdb, @todo)
unless $opts{"no-depends-at-all"};
@@ -1558,6 +1537,29 @@ sub action_update {
@new, @updated )};
print "totalsize $sizes{'__TOTAL__'}\n" if $::machinereadable;
+ print "end-of-header\n" if $::machinereadable;
+
+ #
+ # we have to remove all the stuff before we install other packages
+ # to support moving of files from one package to another.
+ # remove the packages that have disappeared:
+ for my $p (keys %removals) {
+ if ($opts{"no-remove"}) {
+ info("not removing $p due to -no-remove (removed on server)\n");
+ } else {
+ if ($::machinereadable) {
+ # TODO version numbers
+ machine_line($p, $FLAG_REMOVE, "-", "-");
+ } else {
+ info("remove $p (removed on server)\n");
+ }
+ }
+ if (!($opts{"dry-run"} or $opts{"list"} or $opts{"no-remove"})) {
+ merge_into(\%ret, &remove_package($p, $localtlpdb));
+ logpackage("remove: $p");
+ }
+ }
+
# install all the new packages first
for my $pkg (sort @new) {