diff options
| author | Norbert Preining <preining@logic.at> | 2012-02-20 23:15:20 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2012-02-20 23:15:20 +0000 |
| commit | d6de4f3843fc7653cdfae41e83d6b89249e507de (patch) | |
| tree | 73d454e77c34fa597e585e472a5f307b6d9d629a /Master/tlpkg/dev | |
| parent | c9dbdcc25fbcc54f6a8bfb74e150215bbcffd5a5 (diff) | |
update multi-source patch with idea for numerical pinning support
git-svn-id: svn://tug.org/texlive/trunk@25442 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/dev')
| -rw-r--r-- | Master/tlpkg/dev/dev.multi-source-support-v2.patch | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/Master/tlpkg/dev/dev.multi-source-support-v2.patch b/Master/tlpkg/dev/dev.multi-source-support-v2.patch index b884aa879d5..d50839473a5 100644 --- a/Master/tlpkg/dev/dev.multi-source-support-v2.patch +++ b/Master/tlpkg/dev/dev.multi-source-support-v2.patch @@ -1,12 +1,12 @@ --- texmf/scripts/texlive/tlmgr.pl | 907 ++++++++++++++++++++++++++++++++++------- - tlpkg/TeXLive/TLPDB.pm | 665 +++++++++++++++++++++++++++--- - 2 files changed, 1377 insertions(+), 195 deletions(-) + tlpkg/TeXLive/TLPDB.pm | 691 ++++++++++++++++++++++++++++--- + 2 files changed, 1402 insertions(+), 196 deletions(-) Index: tlpkg/TeXLive/TLPDB.pm =================================================================== ---- tlpkg/TeXLive/TLPDB.pm.orig 2012-01-19 23:54:41.731610641 +0900 -+++ tlpkg/TeXLive/TLPDB.pm 2012-01-27 13:21:36.856478592 +0900 +--- tlpkg/TeXLive/TLPDB.pm.orig 2012-01-30 10:48:02.284183279 +0900 ++++ tlpkg/TeXLive/TLPDB.pm 2012-02-09 08:46:31.248950126 +0900 @@ -70,20 +70,31 @@ $tlpdb->settings; $tlpdb->setting($key, [$value]); @@ -612,7 +612,7 @@ Index: tlpkg/TeXLive/TLPDB.pm if (defined($pkg)) { foreach my $d ($pkg->depends) { if ($d =~ m!^$pre([^:]*):(.*)!) { -@@ -1858,6 +2073,338 @@ +@@ -1858,6 +2073,362 @@ =back @@ -817,6 +817,27 @@ Index: tlpkg/TeXLive/TLPDB.pm + } +} + ++# ++# current format: ++# <repo>:<pkg_glob>[,<pkg_glob>,...][:<options>] ++# only supported options for now is ++# revision ++# meaning that, if for the selected package there is no other ++# "non-revision" pinning, then all repo/package versions are compared ++# using normal revision comparison, and the biggest revision number wins. ++# That allows you to have the same package in several repos: ++# repo1:foo:revision ++# repo2:foo:revision ++# repo1:* ++# repo2:* ++# means that: ++# for package "foo" the revision numbers of "foo" in the repos "repo1", ++# "repo2", and "main" are numerically compared and biggest number wins. ++# for all other packages of "repo1" and "repo2", other other repositories ++# are not considered. ++# ++# NOT IMPLEMENTED YET!!! ++# +# $pin{'repo'} = $repo; +# $pin{'glob'} = $glob; +# $pin{'re'} = $re; @@ -824,11 +845,14 @@ Index: tlpkg/TeXLive/TLPDB.pm +sub make_pin_data_from_line { + my $self = shift; + my $l = shift; -+ my ($a, $b) = split(/:/, $l); ++ my ($a, $b, $c) = split(/:/, $l); + my @ret; + my %m; + $m{'repo'} = $a; + $m{'line'} = $l; ++ if (defined($c)) { ++ $m{'options'} = $c; ++ } + # split the package globs + for (split(/,/, $b)) { + my %mm = %m; @@ -951,10 +975,16 @@ Index: tlpkg/TeXLive/TLPDB.pm =pod =head1 OPTIONS +@@ -1919,4 +2490,4 @@ + ### tab-width: 2 + ### indent-tabs-mode: nil + ### End: +-# vim:set tabstop=2 expandtab: # ++# vim:set tabstop=2 expandtab autoindent: # Index: texmf/scripts/texlive/tlmgr.pl =================================================================== ---- texmf/scripts/texlive/tlmgr.pl.orig 2012-01-19 23:54:41.703610104 +0900 -+++ texmf/scripts/texlive/tlmgr.pl 2012-01-27 13:21:46.424487329 +0900 +--- texmf/scripts/texlive/tlmgr.pl.orig 2012-01-31 23:25:04.175697912 +0900 ++++ texmf/scripts/texlive/tlmgr.pl 2012-02-03 13:08:05.773609454 +0900 @@ -124,6 +124,7 @@ "package-logfile" => "=s", "persistent-downloads" => "!", |