Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

IGN:...

Browse Source
This commit is contained in:
Kovid Goyal 2008-06-28 20:16:38 -07:00
parent b67305911f
commit 566665a057
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/__init__.py
View File

@ -409,8 +409,8 @@ def relpath(target, base=os.curdir):
target_list = (os.path.abspath(target)).split(os.sep) target_list = (os.path.abspath(target)).split(os.sep)
# On the windows platform the target may be on a completely different drive from the base. # On the windows platform the target may be on a completely different drive from the base.
if iswindows and base_list[0] != target_list[0]: if iswindows and base_list[0].upper() != target_list[0].upper():
raise OSError, 'Target is on a different drive to base. Target: '+target_list[0].upper()+', base: '+base_list[0].upper() raise OSError, 'Target is on a different drive to base. Target: '+repr(target)+', base: '+repr(base)
# Starting from the filepath root, work out how much of the filepath is # Starting from the filepath root, work out how much of the filepath is
# shared by base and target. # shared by base and target.

5
src/calibre/ebooks/metadata/__init__.py
View File

@ -83,7 +83,10 @@ class Resource(object):
frag = '#'+quote(self.fragment) if self.fragment else '' frag = '#'+quote(self.fragment) if self.fragment else ''
if self.path == basedir: if self.path == basedir:
return ''+frag return ''+frag
rpath = relpath(self.path, basedir) try:
rpath = relpath(self.path, basedir)
except OSError: # On windows path and basedir could be on different drives
rpath = self.path
return quote(rpath.replace(os.sep, '/'))+frag return quote(rpath.replace(os.sep, '/'))+frag