Finally fixed and adapted all code around to the new isWindowsDriveLetterPath() function

This commit is contained in:
Bernardo Damele
2010-04-23 16:34:20 +00:00
parent 0f80768e66
commit a1b1f960cc
11 changed files with 30 additions and 25 deletions

View File

@@ -57,7 +57,7 @@ class Takeover(GenericTakeover):
# Reference: http://dev.mysql.com/doc/refman/5.1/en/server-options.html#option_mysqld_basedir
self.__basedir = inject.getValue("SELECT @@basedir")
self.__basedir = normalizePath(ntToPosixSlashes(self.__basedir))
self.__basedir = ntToPosixSlashes(normalizePath(self.__basedir))
if re.search("^[\w]\:[\/\\\\]+", self.__basedir, re.I):
kb.os = "Windows"
@@ -78,7 +78,7 @@ class Takeover(GenericTakeover):
# NOTE: specifying the relative path as './udf.dll'
# saves in @@datadir on both MySQL 4.1 and MySQL 5.0
self.__datadir = "."
self.__datadir = normalizePath(ntToPosixSlashes(self.__datadir))
self.__datadir = ntToPosixSlashes(normalizePath(self.__datadir))
if re.search("[\w]\:\/", self.__datadir, re.I):
kb.os = "Windows"