summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-31 18:40:30 +0000
committerKarl Berry <karl@freefriends.org>2012-05-31 18:40:30 +0000
commit7b6cf8396c9aa6314818a423c19acf04097a73ad (patch)
tree08541392ab8fe6f3ea803fa2dbb283372f748ba9 /Build
parentca084f3a80b0c4e1af96d924e2bc01b7d7bb47f1 (diff)
accept /var/root too
git-svn-id: svn://tug.org/texlive/trunk@26743 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/tetex/ChangeLog4
-rwxr-xr-xBuild/source/texk/tetex/updmap.pl4
2 files changed, 6 insertions, 2 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index 4f246e2349b..f8d644287f0 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-31 Karl Berry <karl@tug.org>
+
+ * updmap.pl (reset_root_home): accept /var/root.
+
2012-05-31 Norbert Preining <preining@logic.at>
* updmap.pl: reset root $HOME if it is not the real one, since
diff --git a/Build/source/texk/tetex/updmap.pl b/Build/source/texk/tetex/updmap.pl
index e042b517596..7dbc7ec4880 100755
--- a/Build/source/texk/tetex/updmap.pl
+++ b/Build/source/texk/tetex/updmap.pl
@@ -1879,8 +1879,8 @@ sub reset_root_home {
# if $HOME isn't an existing directory, that's ok; TLU does this.
if (defined($envhome) && (-d $envhome)) {
# we want to avoid calling getpwuid as far as possible, so if
- # $envhome is either / or /root we accept it straight ahead
- if ($envhome eq "/" || $envhome eq "/root") {
+ # $envhome is one of some usual values we accept it without worrying.
+ if ($envhome =~ m,^(/|/root|/var/root)/*$, {
return;
}
# $HOME is defined, check what is the home of root in reality