summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-10-11 00:02:45 +0000
committerNorbert Preining <preining@logic.at>2008-10-11 00:02:45 +0000
commit794a222d321c1f54ad3d0ccae53bfdddbb2c037e (patch)
treece4432c2cfe19347a9ab845177131de3cc351ed1 /Master
parent1a5ee81681544353ec1d0d5bb03fd2683588ead5 (diff)
tlmgr: do not call abs_path on windows if the location starts with g: or
something similar, since that might be a DVD device and abs_path terminates the whole process on win32! git-svn-id: svn://tug.org/texlive/trunk@10920 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl6
1 files changed, 5 insertions, 1 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index d13a4da9879..e3f17ace91d 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1457,7 +1457,11 @@ sub init_local_db {
if ($location =~ m/^ctan$/i) {
$location = "$TeXLive::TLConfig::TeXLiveURL";
}
- if ($location !~ m!^(http|ftp)://!i) {
+ # we normalize the path only if it is
+ # - neither a URL starting with http or ftp
+ # - if we are on windows it does not start with Drive:
+ if (! ( $location =~ m!^(http|ftp)://!i ||
+ (win32() && $location =~ m!^.:!) ) ) {
# seems to be a local path, try to normalize it
my $testloc = abs_path($location);
# however, if we were given a url, that will get "normalized" to the