summaryrefslogtreecommitdiff
path: root/Master/tlpkg/dev
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2012-01-18 01:09:57 +0000
committerNorbert Preining <preining@logic.at>2012-01-18 01:09:57 +0000
commitcf3b1f0ffb4067e957a0e532170c6a17f02f5c7b (patch)
tree3f0da95f0477a108eed6c02a38adfb0a32ce13d5 /Master/tlpkg/dev
parent507fa8e361c59a01a0271fcbe8d01433d137bbba (diff)
update multi-source support after comments from Karl
git-svn-id: svn://tug.org/texlive/trunk@25135 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/dev')
-rw-r--r--Master/tlpkg/dev/quilt-patches/dev.multi-source-support-v2.patch74
1 files changed, 42 insertions, 32 deletions
diff --git a/Master/tlpkg/dev/quilt-patches/dev.multi-source-support-v2.patch b/Master/tlpkg/dev/quilt-patches/dev.multi-source-support-v2.patch
index 4acee6a8263..7cff5fb8875 100644
--- a/Master/tlpkg/dev/quilt-patches/dev.multi-source-support-v2.patch
+++ b/Master/tlpkg/dev/quilt-patches/dev.multi-source-support-v2.patch
@@ -1,12 +1,12 @@
---
- texmf/scripts/texlive/tlmgr.pl | 897 ++++++++++++++++++++++++++++++++++-------
+ texmf/scripts/texlive/tlmgr.pl | 907 ++++++++++++++++++++++++++++++++++-------
tlpkg/TeXLive/TLPDB.pm | 669 +++++++++++++++++++++++++++---
- 2 files changed, 1369 insertions(+), 197 deletions(-)
+ 2 files changed, 1379 insertions(+), 197 deletions(-)
Index: tlpkg/TeXLive/TLPDB.pm
===================================================================
---- tlpkg/TeXLive/TLPDB.pm.orig 2011-07-02 15:31:51.000000000 +0900
-+++ tlpkg/TeXLive/TLPDB.pm 2012-01-12 12:51:17.000000000 +0900
+--- tlpkg/TeXLive/TLPDB.pm.orig 2012-01-12 14:25:20.000000000 +0900
++++ tlpkg/TeXLive/TLPDB.pm 2012-01-18 09:54:41.587756406 +0900
@@ -70,20 +70,31 @@
$tlpdb->settings;
$tlpdb->setting($key, [$value]);
@@ -964,8 +964,8 @@ Index: tlpkg/TeXLive/TLPDB.pm
=head1 OPTIONS
Index: texmf/scripts/texlive/tlmgr.pl
===================================================================
---- texmf/scripts/texlive/tlmgr.pl.orig 2011-10-27 23:06:37.000000000 +0900
-+++ texmf/scripts/texlive/tlmgr.pl 2012-01-12 12:51:18.000000000 +0900
+--- texmf/scripts/texlive/tlmgr.pl.orig 2012-01-12 14:25:20.000000000 +0900
++++ texmf/scripts/texlive/tlmgr.pl 2012-01-18 10:08:48.582889699 +0900
@@ -124,6 +124,7 @@
"package-logfile" => "=s",
"persistent-downloads" => "!",
@@ -1341,7 +1341,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
+ my $kbstr = ($kb >= 0 ? " [${kb}k]" : "");
+ my $kbstrlen = length($kbstr);
+ my $pkglen = length($pkg);
-+ my $is = sprintf("%-10s ", "$txt:");
++ my $is = sprintf("%-9s ", "$txt:");
+ if ($pkglen + $kbstrlen > $flen) {
+ $is .= "$pkg$kbstr: ";
+ } else {
@@ -1410,7 +1410,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
machine_line($p, $FLAG_REMOVE, $rev, "-", "-", "-");
} else {
- info("$p: local: $rev, source: <absent> (auto-remove)\n");
-+ upd_info($p, -1, $rev, "<absent>", "a-remove");
++ upd_info($p, -1, $rev, "<absent>", "autorem");
}
$currnr++;
} else {
@@ -1432,7 +1432,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
$currnr++;
}
}
-@@ -2678,19 +2787,39 @@
+@@ -2678,19 +2787,44 @@
my $unwind_package;
my $remove_unwind_container = 0;
my $rev = $tlp->revision;
@@ -1469,13 +1469,18 @@ Index: texmf/scripts/texlive/tlmgr.pl
+ my @cand = $remotetlpdb->candidates($pkg);
+ shift @cand; # remove the top element
+ if (@cand) {
-+ print "\tother candidates: @cand\n";
++ print "\tother candidates: ";
++ for my $a (@cand) {
++ my ($t,$r) = split(/\//, $a, 2);
++ print $r . '@' . $t . " ";
++ }
++ print "\n";
+ }
+ }
}
$updated{$pkg} = 1;
next;
-@@ -2731,10 +2860,11 @@
+@@ -2731,10 +2865,11 @@
}
if ($::machinereadable) {
@@ -1489,7 +1494,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
}
$donesize += $sizes{$pkg};
$currnr++;
-@@ -2777,7 +2907,7 @@
+@@ -2777,7 +2912,7 @@
}
if ($remotetlpdb->install_package($pkg, $localtlpdb)) {
# installation succeeded because we got a reference
@@ -1498,7 +1503,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
unlink($unwind_package) if $remove_unwind_container;
# remember successful update
$updated{$pkg} = 1;
-@@ -2805,7 +2935,7 @@
+@@ -2805,7 +2940,7 @@
# now in fact we should do some cleanup, removing files and
# dirs from the new package before re-installing the old one.
# TODO
@@ -1507,7 +1512,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
tlwarn("\n\nInstallation of new version of $pkg did fail, trying to unwind.\n");
if (win32()) {
# w32 is notorious for not releasing a file immediately
-@@ -2846,12 +2976,25 @@
+@@ -2846,12 +2981,25 @@
unless $::machinereadable;
} else {
# install new packages
@@ -1534,7 +1539,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
my ($estrem, $esttot);
if (!$opts{"list"}) {
($estrem, $esttot) = TeXLive::TLUtils::time_estimate($totalsize,
-@@ -2861,14 +3004,16 @@
+@@ -2861,14 +3009,16 @@
my @maargs = ($pkg, $FLAG_AUTOINSTALL, "-", $mediatlp->revision, $sizes{$pkg});
if (!$opts{"list"}) {
push @maargs, $estrem, $esttot;
@@ -1547,14 +1552,14 @@ Index: texmf/scripts/texlive/tlmgr.pl
my $kb = int($sizes{$pkg} / 1024) + 1;
if ($opts{"list"}) {
- info("$pkg [${kb}k]: local: <absent>, source: " . $mediatlp->revision . " (auto-install)\n");
-+ upd_info($pkg, $kb, "<absent>", $mediarevstr, "a-install");
++ upd_info($pkg, $kb, "<absent>", $mediarevstr, "autoinst");
} else {
- info("[$currnr/$totalnr, $estrem/$esttot] auto-install: $pkg [${kb}k]\n");
+ info("[$currnr/$totalnr, $estrem/$esttot] auto-install: $pkg ($mediarevstr) [${kb}k]\n");
}
}
$currnr++;
-@@ -2876,7 +3021,7 @@
+@@ -2876,7 +3026,7 @@
next if ($opts{"dry-run"} || $opts{"list"});
if ($remotetlpdb->install_package($pkg, $localtlpdb)) {
# installation succeeded because we got a reference
@@ -1563,7 +1568,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
$nrupdated++;
} else {
tlwarn("$0: couldn't install new package $pkg\n");
-@@ -3023,6 +3168,7 @@
+@@ -3023,6 +3173,7 @@
if (!(@new || @updated)) {
info("tlmgr: no updates available\n");
if ($remotetlpdb->media ne "NET"
@@ -1571,7 +1576,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
&& !$opts{"dry-run"}
&& !$opts{"repository"}
) {
-@@ -3101,6 +3247,14 @@
+@@ -3101,6 +3252,14 @@
@packs = $remotetlpdb->expand_dependencies($localtlpdb, @packs) unless $opts{"no-depends"};
}
#
@@ -1586,7 +1591,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
# installation order of packages:
# first all normal packages, then collections, then schemes
# isn't already installed, but the collection already updated, it will
-@@ -3108,7 +3262,7 @@
+@@ -3108,7 +3267,7 @@
my @inst_packs;
my @inst_colls;
my @inst_schemes;
@@ -1595,7 +1600,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
# we do name checking here, not to load all tlpobj again and again
if ($pkg =~ m/^scheme-/) {
push @inst_schemes, $pkg;
-@@ -3127,7 +3281,11 @@
+@@ -3127,7 +3286,11 @@
my @todo;
for my $pkg (@inst_packs, @inst_colls, @inst_schemes) {
my $pkgrev = 0;
@@ -1608,7 +1613,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
if (!defined($mediatlp)) {
tlwarn("package $pkg not present in package repository.\n");
next;
-@@ -3175,13 +3333,26 @@
+@@ -3175,13 +3338,26 @@
my ($estrem, $esttot) = TeXLive::TLUtils::time_estimate($totalsize,
$donesize, $starttime);
my $kb = int($sizes{$pkg} / 1024) + 1;
@@ -1638,7 +1643,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
logpackage("${re}install: $pkg");
}
$donesize += $sizes{$pkg};
-@@ -3204,7 +3375,7 @@
+@@ -3204,7 +3380,7 @@
# we list them, otherwise we go direct into tlmgr show $pkg mode
if ($what !~ m/^(collection|scheme)/i) {
tlwarn("(switching to show mode)\n");
@@ -1647,7 +1652,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
return;
}
} else {
-@@ -3223,7 +3394,11 @@
+@@ -3223,7 +3399,11 @@
} elsif ($what =~ m/^scheme/i) {
@whattolist = $tlm->schemes;
} else {
@@ -1660,7 +1665,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
}
foreach (@whattolist) {
next if ($_ =~ m/^00texlive/);
-@@ -3232,12 +3407,198 @@
+@@ -3232,12 +3412,198 @@
} else {
print " ";
}
@@ -1860,7 +1865,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
# OPTION
#
-@@ -4601,6 +4962,82 @@
+@@ -4601,6 +4967,87 @@
#
sub init_tlmedia
{
@@ -1931,8 +1936,13 @@ Index: texmf/scripts/texlive/tlmgr.pl
+ # this "location-url" line should not be changed since GUI programs
+ # depend on it:
+ print "location-url\t$locstr\n" if $::machinereadable;
-+ info("tlmgr: package repository $locstr\n");
-+
++ info("tlmgr: package repository:\n");
++ info("\tmain = " . $repos{'main'} . "\n");
++ for my $t (@tags) {
++ if ($t ne 'main') {
++ info("\t$t = " . $repos{$t} . "\n");
++ }
++ }
+}
+
+
@@ -1943,7 +1953,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
if (defined($remotetlpdb) && ($remotetlpdb->root eq $location)) {
# nothing to be done
return;
-@@ -4614,10 +5051,28 @@
+@@ -4614,10 +5061,28 @@
$location =~ s,^$TeXLiveServerURL,$mirrorbase,;
}
@@ -1972,7 +1982,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
# if we talk about a net location try to download the hash of the tlpdb
# - if that is possible, check for the locally saved file and if the hash
-@@ -4763,8 +5218,30 @@
+@@ -4763,8 +5228,30 @@
close($tlfh);
}
}
@@ -2003,7 +2013,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
# finish handles the -pause option (wait for input from stdin),
-@@ -5561,6 +6038,42 @@
+@@ -5561,6 +6048,42 @@
=back
@@ -2046,7 +2056,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
=head2 option
-@@ -6198,6 +6711,118 @@
+@@ -6198,6 +6721,118 @@
GUI and a simplified GUI with only the important and mostly used
settings.