diff options
| author | Karl Berry <karl@freefriends.org> | 2013-04-18 22:58:52 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2013-04-18 22:58:52 +0000 |
| commit | 5514e6a9c75aa1f87e470e29227c3a78b6659eca (patch) | |
| tree | d4b47b9e992ae986c26fa0420eafa2de2e006c6a /Build/source/texk | |
| parent | febfb1187ddff290a6d332009db5797488c693de (diff) | |
sync
git-svn-id: svn://tug.org/texlive/trunk@30017 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
| -rw-r--r-- | Build/source/texk/tests/TeXLive/TLConfig.pm | 5 | ||||
| -rw-r--r-- | Build/source/texk/tests/TeXLive/TLUtils.pm | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm index 6eb7755df44..4e88b3aa484 100644 --- a/Build/source/texk/tests/TeXLive/TLConfig.pm +++ b/Build/source/texk/tests/TeXLive/TLConfig.pm @@ -5,7 +5,7 @@ package TeXLive::TLConfig; -my $svnrev = '$Revision: 29725 $'; +my $svnrev = '$Revision: 29883 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -184,7 +184,8 @@ our %TLPDBOptions = ( our %TLPDBSettings = ( "platform" => [ "s", "Main platform for this computer" ], - "available_architectures" => [ "l", "All available/installed architectures" ] + "available_architectures" => [ "l", "All available/installed architectures" ], + "usertree" => [ "b", "This tree acts as user tree" ] ); our $WindowsMainMenuName = "TeX Live $ReleaseYear"; diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index f4faeef0d56..b5902c6ed12 100644 --- a/Build/source/texk/tests/TeXLive/TLUtils.pm +++ b/Build/source/texk/tests/TeXLive/TLUtils.pm @@ -5,7 +5,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 29725 $'; +my $svnrev = '$Revision: 29926 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -1327,7 +1327,7 @@ sub install_packages { # if a package is relocatable we have to cancel the reloc prefix # before we save it to the local tlpdb if ($tlpobj->relocated) { - $tlpobj->cancel_reloc_prefix; + $tlpobj->replace_reloc_prefix; } $totlpdb->add_tlpobj($tlpobj); # we have to write out the tlpobj file since it is contained in the @@ -3678,10 +3678,10 @@ sub compare_tlpobjs { $ret{'revision'} = "$rA:$rB"; } if ($tlpA->relocated) { - $tlpA->cancel_reloc_prefix; + $tlpA->replace_reloc_prefix; } if ($tlpB->relocated) { - $tlpB->cancel_reloc_prefix; + $tlpB->replace_reloc_prefix; } my @fA = $tlpA->all_files; my @fB = $tlpB->all_files; |