summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2013-04-15 06:13:30 +0000
committerNorbert Preining <preining@logic.at>2013-04-15 06:13:30 +0000
commit38f2f20d083cbd7ae21a4e9f725a4b938d1fb98b (patch)
tree98bc4b64bd8153e552eab405600b6a0fc1fdc527 /Master/tlpkg
parent0dc3709c5bfd2afea62f90e7ef271d45ce6f886c (diff)
fixes to usermode introduced regressions
- compare_tlpdb did cancel instead of replace the relocated prefix, breaking tl-compare-tlpdb - installation of packages in normal mode did cancel instead of replace the relocated prefix, breaking proper lising in the users tlpdb git-svn-id: svn://tug.org/texlive/trunk@29926 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm6
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm4
2 files changed, 7 insertions, 3 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index f0f1c25fc2c..29a4f8bf9ed 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -1591,7 +1591,11 @@ sub not_virtual_install_package {
# and unset the relocated setting
# before we save it to the local tlpdb
if ($tlpobj->relocated) {
- $tlpobj->cancel_reloc_prefix;
+ if ($totlpdb->setting("usertree")) {
+ $tlpobj->cancel_reloc_prefix;
+ } else {
+ $tlpobj->replace_reloc_prefix;
+ }
$tlpobj->relocated(0);
}
# we have to write out the tlpobj file since it is contained in the
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 9ee6549e364..a989afb9e6f 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -3679,10 +3679,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;