summaryrefslogtreecommitdiff
path: root/Master/tlpkg/dev
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2012-03-24 07:48:00 +0000
committerNorbert Preining <preining@logic.at>2012-03-24 07:48:00 +0000
commit6395228ed84fbc0d252ea34375dd93fffbaecb57 (patch)
tree41665c191a7f705629779654645c2b544359c7d7 /Master/tlpkg/dev
parent6a0fc52f04c3639d212d0455981765f29b0aa256 (diff)
fix arch detection and report in multi mode
git-svn-id: svn://tug.org/texlive/trunk@25734 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/dev')
-rw-r--r--Master/tlpkg/dev/dev.multi-source-support-v2.patch71
1 files changed, 36 insertions, 35 deletions
diff --git a/Master/tlpkg/dev/dev.multi-source-support-v2.patch b/Master/tlpkg/dev/dev.multi-source-support-v2.patch
index 25e97660d23..ab37f7cf9fd 100644
--- a/Master/tlpkg/dev/dev.multi-source-support-v2.patch
+++ b/Master/tlpkg/dev/dev.multi-source-support-v2.patch
@@ -1,13 +1,13 @@
---
texmf/scripts/texlive/tlmgr.pl | 916 ++++++++++++++++++++++++++++++++------
texmf/scripts/texlive/tlmgrgui.pl | 236 ++++++++-
- tlpkg/TeXLive/TLPDB.pm | 705 ++++++++++++++++++++++++++---
- 3 files changed, 1617 insertions(+), 240 deletions(-)
+ tlpkg/TeXLive/TLPDB.pm | 706 ++++++++++++++++++++++++++---
+ 3 files changed, 1618 insertions(+), 240 deletions(-)
Index: tlpkg/TeXLive/TLPDB.pm
===================================================================
--- tlpkg/TeXLive/TLPDB.pm.orig 2012-01-30 10:48:02.284183279 +0900
-+++ tlpkg/TeXLive/TLPDB.pm 2012-03-23 21:19:39.632811501 +0900
++++ tlpkg/TeXLive/TLPDB.pm 2012-03-24 16:46:21.342566067 +0900
@@ -70,20 +70,31 @@
$tlpdb->settings;
$tlpdb->setting($key, [$value]);
@@ -135,15 +135,16 @@ Index: tlpkg/TeXLive/TLPDB.pm
return $self->{'media'};
}
-@@ -417,6 +453,18 @@
+@@ -417,6 +453,19 @@
sub available_architectures {
my $self = shift;
+ my @archs;
+ if ($self->is_virtual) {
+ for my $k (keys %{$self->{'tlpdbs'}}) {
-+ push @archs, $self->{'tlpdbs'}{$k}->available_architectures;
++ TeXLive::TLUtils::push_uniq \@archs, $self->{'tlpdbs'}{$k}->available_architectures;
+ }
++ return sort @archs;
+ } else {
+ return $self->_available_architectures;
+ }
@@ -154,7 +155,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
my @archs = $self->setting("available_architectures");
if (! @archs) {
# fall back to the old method checking tex\.*
-@@ -444,6 +492,10 @@
+@@ -444,6 +493,10 @@
sub add_tlpcontainer {
my ($self, $package, $ziplocation, $archrefs, $dest) = @_;
@@ -165,7 +166,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
my @archs;
if (defined($archrefs)) {
@archs = @$archrefs;
-@@ -508,6 +560,29 @@
+@@ -508,6 +561,29 @@
=cut
sub get_package {
@@ -195,7 +196,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
my ($self,$pkg) = @_;
if (defined($self->{'tlps'}{$pkg})) {
my $ret = $self->{'tlps'}{$pkg};
-@@ -519,6 +594,35 @@
+@@ -519,6 +595,35 @@
=pod
@@ -231,7 +232,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
=item C<< $tlpdb->list_packages >>
The C<list_packages> function returns the list of all included packages.
-@@ -527,6 +631,34 @@
+@@ -527,6 +632,34 @@
sub list_packages {
my $self = shift;
@@ -266,7 +267,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
return (sort keys %{$self->{'tlps'}});
}
-@@ -544,6 +676,11 @@
+@@ -544,6 +677,11 @@
The next (or first) argument is the target TLPDB, then a list of
packages.
@@ -278,7 +279,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
We return the closure of the package list with respect to the depends
operator. (Sorry, that was for mathematicians.)
-@@ -567,7 +704,8 @@
+@@ -567,7 +705,8 @@
my %install = ();
my @archs = $totlpdb->available_architectures;
for my $p (@_) {
@@ -288,7 +289,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
}
my $changed = 1;
while ($changed) {
-@@ -576,7 +714,7 @@
+@@ -576,7 +715,7 @@
ddebug("pre_select = @pre_select\n");
for my $p (@pre_select) {
next if ($p =~ m/^00texlive/);
@@ -297,7 +298,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
if (!defined($pkg)) {
debug("W: $p is mentioned somewhere but not available, disabling\n");
$install{$p} = 0;
-@@ -602,16 +740,19 @@
+@@ -602,16 +741,19 @@
if ($p_dep =~ m/^(.*)\.ARCH$/) {
my $foo = "$1";
foreach $a (@archs) {
@@ -320,7 +321,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
}
}
}
-@@ -623,7 +764,9 @@
+@@ -623,7 +765,9 @@
$changed = 1;
}
}
@@ -331,7 +332,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
}
=pod
-@@ -635,6 +778,7 @@
+@@ -635,6 +779,7 @@
=cut
@@ -339,7 +340,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
sub find_file {
my ($self,$fn) = @_;
my @ret;
-@@ -868,6 +1012,10 @@
+@@ -868,6 +1013,10 @@
sub root {
my $self = shift;
@@ -350,7 +351,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
if (@_) { $self->{'root'} = shift }
return $self->{'root'};
}
-@@ -887,6 +1035,10 @@
+@@ -887,6 +1036,10 @@
sub location {
my $self = shift;
@@ -361,7 +362,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
return "$self->{'root'}/$InfraLocation/$DatabaseName";
}
-@@ -937,8 +1089,14 @@
+@@ -937,8 +1090,14 @@
sub config_src_container {
my $self = shift;
@@ -378,7 +379,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
if ($d =~ m!^container_split_src_files/(.*)$!) {
return "$1";
}
-@@ -958,8 +1116,14 @@
+@@ -958,8 +1117,14 @@
sub config_doc_container {
my $self = shift;
@@ -395,7 +396,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
if ($d =~ m!^container_split_doc_files/(.*)$!) {
return "$1";
}
-@@ -978,8 +1142,14 @@
+@@ -978,8 +1143,14 @@
sub config_container_format {
my $self = shift;
@@ -412,7 +413,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
if ($d =~ m!^container_format/(.*)$!) {
return "$1";
}
-@@ -998,8 +1168,14 @@
+@@ -998,8 +1169,14 @@
sub config_release {
my $self = shift;
@@ -429,7 +430,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
if ($d =~ m!^release/(.*)$!) {
return "$1";
}
-@@ -1018,8 +1194,14 @@
+@@ -1018,8 +1195,14 @@
sub config_minrelease {
my $self = shift;
@@ -446,7 +447,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
if ($d =~ m!^minrelease/(.*)$!) {
return "$1";
}
-@@ -1039,8 +1221,14 @@
+@@ -1039,8 +1222,14 @@
sub config_revision {
my $self = shift;
@@ -463,7 +464,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
if ($d =~ m!^revision/(.*)$!) {
return "$1";
}
-@@ -1066,12 +1254,12 @@
+@@ -1066,12 +1255,12 @@
sub sizes_of_packages {
my ($self, $opt_src, $opt_doc, @packs) = @_;
@packs || ( @packs = $self->list_packages() );
@@ -477,7 +478,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
if (!defined($tlpobjs{$p})) {
warn "STRANGE: $p not to be found in ", $self->root;
next;
-@@ -1110,31 +1298,46 @@
+@@ -1110,31 +1299,46 @@
=pod
@@ -538,7 +539,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
} else {
my $container_src_split = $fromtlpdb->config_src_container;
my $container_doc_split = $fromtlpdb->config_doc_container;
-@@ -1182,7 +1385,7 @@
+@@ -1182,7 +1386,7 @@
next;
}
} elsif (&media eq 'NET') {
@@ -547,7 +548,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
}
$self->_install_package ($container, $reloc, \@installfiles, $totlpdb)
|| return(0);
-@@ -1256,23 +1459,21 @@
+@@ -1256,23 +1460,21 @@
$totlpdb->save;
# compute the return value
TeXLive::TLUtils::announce_execute_actions("enable", $tlpobj);
@@ -585,7 +586,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
}
return 1;
}
-@@ -1525,7 +1726,7 @@
+@@ -1525,7 +1727,7 @@
# the postaction code part cannot be evaluated now since the
# files are already removed.
# Again, desktop integration maps to desktop and menu links
@@ -594,7 +595,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
&TeXLive::TLUtils::do_postaction("remove", $tlp,
$localtlpdb->option("file_assocs"),
$localtlpdb->option("desktop_integration"),
-@@ -1557,7 +1758,12 @@
+@@ -1557,7 +1759,12 @@
sub _set_value_pkg {
my ($self,$pkgname,$pre,$key,$value) = @_;
my $k = "$pre$key";
@@ -608,7 +609,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
my @newdeps;
if (!defined($pkg)) {
$pkg = new TeXLive::TLPOBJ;
-@@ -1595,8 +1801,14 @@
+@@ -1595,8 +1802,14 @@
sub _value_pkg {
my ($self,$pkg,$pre,$key) = @_;
my $k = "$pre$key";
@@ -625,7 +626,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
if ($d =~ m!^$k:(.*)$!) {
return "$1";
}
-@@ -1709,7 +1921,12 @@
+@@ -1709,7 +1922,12 @@
my ($self, $pre, $hr) = @_;
my @allowed = keys %$hr;
my %ret;
@@ -639,7 +640,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
if (defined($pkg)) {
foreach my $d ($pkg->depends) {
if ($d =~ m!^$pre([^:]*):(.*)!) {
-@@ -1858,6 +2075,362 @@
+@@ -1858,6 +2076,362 @@
=back
@@ -1002,7 +1003,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
=pod
=head1 OPTIONS
-@@ -1919,4 +2492,4 @@
+@@ -1919,4 +2493,4 @@
### tab-width: 2
### indent-tabs-mode: nil
### End:
@@ -1011,7 +1012,7 @@ Index: tlpkg/TeXLive/TLPDB.pm
Index: texmf/scripts/texlive/tlmgr.pl
===================================================================
--- texmf/scripts/texlive/tlmgr.pl.orig 2012-01-31 23:25:04.175697912 +0900
-+++ texmf/scripts/texlive/tlmgr.pl 2012-03-23 21:21:07.148744300 +0900
++++ texmf/scripts/texlive/tlmgr.pl 2012-03-24 16:46:15.918561526 +0900
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
# $Id: tlmgr.pl 24419 2011-10-27 14:06:37Z preining $
@@ -2240,7 +2241,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
Index: texmf/scripts/texlive/tlmgrgui.pl
===================================================================
--- texmf/scripts/texlive/tlmgrgui.pl.orig 2011-06-16 21:30:37.000000000 +0900
-+++ texmf/scripts/texlive/tlmgrgui.pl 2012-03-23 23:16:44.539481157 +0900
++++ texmf/scripts/texlive/tlmgrgui.pl 2012-03-24 16:46:19.086564149 +0900
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
# $Id: tlmgrgui.pl 23011 2011-06-16 12:30:37Z preining $