diff options
| author | Norbert Preining <preining@logic.at> | 2011-05-29 05:36:41 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2011-05-29 05:36:41 +0000 |
| commit | d33ab02a9b8af6b801b76cae41e989a7b45b7a40 (patch) | |
| tree | 2ffd43b2c07165eb3fd505be7480606e261e8992 /Master/tlpkg | |
| parent | 900aebfe4306ba492b601d2a915f67b4e2e9ee5a (diff) | |
update multi source patch to fix a problem when only one repository with
tag was present
git-svn-id: svn://tug.org/texlive/trunk@22667 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
| -rw-r--r-- | Master/tlpkg/dev/dev.multi-source-support-v2.patch | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Master/tlpkg/dev/dev.multi-source-support-v2.patch b/Master/tlpkg/dev/dev.multi-source-support-v2.patch index 84571d6c05c..c6759733d43 100644 --- a/Master/tlpkg/dev/dev.multi-source-support-v2.patch +++ b/Master/tlpkg/dev/dev.multi-source-support-v2.patch @@ -1,6 +1,6 @@ Index: tlpkg/TeXLive/TLPDB.pm =================================================================== ---- tlpkg/TeXLive/TLPDB.pm (revision 22529) +--- tlpkg/TeXLive/TLPDB.pm (revision 22666) +++ tlpkg/TeXLive/TLPDB.pm (working copy) @@ -70,20 +70,31 @@ $tlpdb->settings; @@ -931,7 +931,7 @@ Index: tlpkg/TeXLive/TLPDB.pm =head1 OPTIONS Index: tlpkg/TeXLive/TLUtils.pm =================================================================== ---- tlpkg/TeXLive/TLUtils.pm (revision 22529) +--- tlpkg/TeXLive/TLUtils.pm (revision 22666) +++ tlpkg/TeXLive/TLUtils.pm (working copy) @@ -62,6 +62,7 @@ TeXLive::TLUtils::setup_programs($bindir, $platform); @@ -983,7 +983,7 @@ Index: tlpkg/TeXLive/TLUtils.pm Index: texmf/scripts/texlive/tlmgr.pl =================================================================== ---- texmf/scripts/texlive/tlmgr.pl (revision 22529) +--- texmf/scripts/texlive/tlmgr.pl (revision 22666) +++ texmf/scripts/texlive/tlmgr.pl (working copy) @@ -124,6 +124,7 @@ "package-logfile" => "=s", @@ -1388,7 +1388,7 @@ Index: texmf/scripts/texlive/tlmgr.pl # OPTION # sub action_option { -@@ -4471,6 +4683,74 @@ +@@ -4471,6 +4683,82 @@ # sub init_tlmedia { @@ -1397,6 +1397,14 @@ Index: texmf/scripts/texlive/tlmgr.pl + #my %repos = repository_to_array($localtlpdb->option("location")); + my %repos = repository_to_array($location); + my @tags = keys %repos; ++ # if we have only one repo, but this one contains a name tag #.... ++ # then we remove it and save the local tlpdb ++ if ($#tags == 0 && ($location =~ m/#/)) { ++ $location = $repos{$tags[0]}; ++ $localtlpdb->option("location", $location); ++ $localtlpdb->save; ++ %repos = repository_to_array($location); ++ } + # check if we are only one tag/repo + if ($#tags == 0) { + # go to normal mode @@ -1463,7 +1471,7 @@ Index: texmf/scripts/texlive/tlmgr.pl if (defined($remotetlpdb) && ($remotetlpdb->root eq $location)) { # nothing to be done return; -@@ -4484,11 +4764,29 @@ +@@ -4484,11 +4772,29 @@ $location =~ s,^$TeXLiveServerURL,$mirrorbase,; } @@ -1493,7 +1501,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 # agrees load the local copy if present instead of the remote one, -@@ -4633,8 +4931,30 @@ +@@ -4633,8 +4939,30 @@ close($tlfh); } } |