diff options
author | Karl Berry <karl@freefriends.org> | 2008-10-29 21:55:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-10-29 21:55:40 +0000 |
commit | 6330dfef663ae379b8d56f0a5b041384ee9f1360 (patch) | |
tree | a45ff302897ae0e6bd96c531e3d21859c6a0976b /Master/tlpkg/archive/rej.tlmgrgui-include-revisions-in-update-list.patch | |
parent | 9d7435122110c28a4c1cb8c434c2c862ee731891 (diff) |
archive rejected patches, delete applied patches, pass -v in update-tlcritical
git-svn-id: svn://tug.org/texlive/trunk@11113 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/archive/rej.tlmgrgui-include-revisions-in-update-list.patch')
-rw-r--r-- | Master/tlpkg/archive/rej.tlmgrgui-include-revisions-in-update-list.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/Master/tlpkg/archive/rej.tlmgrgui-include-revisions-in-update-list.patch b/Master/tlpkg/archive/rej.tlmgrgui-include-revisions-in-update-list.patch new file mode 100644 index 00000000000..fa1d4dd7236 --- /dev/null +++ b/Master/tlpkg/archive/rej.tlmgrgui-include-revisions-in-update-list.patch @@ -0,0 +1,61 @@ +--- /src/TeX/texlive-svn/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui-real.pl 2008-08-22 15:00:15.000000000 +0200 ++++ tlmgrgui-real.pl 2008-08-22 15:28:26.000000000 +0200 +@@ -511,6 +511,9 @@ + } else { + @upgradepkgs = @_; + } ++ # note that the list still contains package names with revision ++ # specifications ++ @upgradepkgs = map { m/(^[^ ]+) /; $1; } @upgradepkgs; + foreach my $p (@upgradepkgs) { + if ($p =~ m/$WinSpecialUpdatePackagesRegexp/) { + $updater_needed = 1; +@@ -521,9 +524,16 @@ + my @execlist; + push @execlist, "tlmgr", "--location", "$location"; + if ($debugmode) { +- push @execlist, "-v"; ++ push @execlist, "-v", "update"; ++ } ++ # remove the revision information ++ if ($_[0] eq "--all") { ++ push @execlist, "--all"; ++ } else { ++ # we got some actual package names, remove the revision info ++ my @foo = map { m/(^[^ ]+) /; $1; } @_; ++ push @execlist, @foo; + } +- push @execlist, "update", @_; + run_program_show_output(@execlist); + if (win32() && $updater_needed) { + my $t = ___"runupdater"; +@@ -572,6 +582,8 @@ + sub create_update_list { + my @ret = (); + my @archret = (); ++ my %localrev; ++ my %remoterev; + if (defined($tlmediatlpdb)) { + foreach my $lp ($localtlpdb->list_packages) { + next if ($lp =~ m/00texlive-installation.config/); +@@ -589,6 +601,8 @@ + } else { + push @ret, $lp; + } ++ $localrev{$lp} = $lrev; ++ $remoterev{$lp} = $urev; + } + } + foreach my $p (@archret) { +@@ -598,6 +612,11 @@ + } + push @ret, $p unless $foundparent; + } ++ my @realret = (); ++ for my $p (@ret) { ++ push @realret, "$p ($localrev{$p} -> $remoterev{$p})"; ++ } ++ @ret = @realret; + # issue a warning if no updates are available, the tlmediatlpdb is loaded + # and is not from the net + if ($#ret < 0) { |