##// END OF EJS Templates
templater: don't normalize path separators to '/' when interacting with OS...
Martin von Zweigbergk -
r45821:28840ef5 default
parent child Browse files
Show More
@@ -848,17 +848,17 b' def _readmapfile(mapfile):'
848 val = conf.get(b'templates', b'__base__')
848 val = conf.get(b'templates', b'__base__')
849 if val and val[0] not in b"'\"":
849 if val and val[0] not in b"'\"":
850 # treat as a pointer to a base class for this style
850 # treat as a pointer to a base class for this style
851 path = util.normpath(os.path.join(base, val))
851 path = os.path.normpath(os.path.join(base, val))
852
852
853 # fallback check in template paths
853 # fallback check in template paths
854 if not os.path.exists(path):
854 if not os.path.exists(path):
855 dir = templatedir()
855 dir = templatedir()
856 if dir is not None:
856 if dir is not None:
857 p2 = util.normpath(os.path.join(dir, val))
857 p2 = os.path.normpath(os.path.join(dir, val))
858 if os.path.isfile(p2):
858 if os.path.isfile(p2):
859 path = p2
859 path = p2
860 else:
860 else:
861 p3 = util.normpath(os.path.join(p2, b"map"))
861 p3 = os.path.normpath(os.path.join(p2, b"map"))
862 if os.path.isfile(p3):
862 if os.path.isfile(p3):
863 path = p3
863 path = p3
864
864
General Comments 0
You need to be logged in to leave comments. Login now