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

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;