Normalize configured paths at a different time so that we don't
destroy URLs used by the svn_ra module. * viewcvs/lib/config.py (_parse_roots): Don't normalize the paths for roots here -- it will destroy URLs. * viewcvs/lib/viewcvs.py (Request.run_viewcvs): Normalize them here, *after* we know what's a URL and what's a normal path. git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@917 8cb11bc2-c004-0410-86c3-e597b4017df7remotes/tags/1.0.0-rc1
parent
302fa88601
commit
2481c9a5c9
|
@ -242,7 +242,7 @@ def _parse_roots(config_name, config_value):
|
||||||
if pos < 0:
|
if pos < 0:
|
||||||
raise MalformedRoot(config_name, root)
|
raise MalformedRoot(config_name, root)
|
||||||
name, path = map(string.strip, (root[:pos], root[pos+1:]))
|
name, path = map(string.strip, (root[:pos], root[pos+1:]))
|
||||||
roots[name] = os.path.normpath(path)
|
roots[name] = path
|
||||||
return roots
|
return roots
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -227,7 +227,7 @@ class Request:
|
||||||
|
|
||||||
# Create the repository object
|
# Create the repository object
|
||||||
if cfg.general.cvs_roots.has_key(self.rootname):
|
if cfg.general.cvs_roots.has_key(self.rootname):
|
||||||
self.rootpath = cfg.general.cvs_roots[self.rootname]
|
self.rootpath = os.path.normpath(cfg.general.cvs_roots[self.rootname])
|
||||||
try:
|
try:
|
||||||
if cfg.general.use_rcsparse:
|
if cfg.general.use_rcsparse:
|
||||||
import vclib.ccvs
|
import vclib.ccvs
|
||||||
|
@ -255,6 +255,7 @@ class Request:
|
||||||
import vclib.svn_ra
|
import vclib.svn_ra
|
||||||
vclib.svn = vclib.svn_ra
|
vclib.svn = vclib.svn_ra
|
||||||
else:
|
else:
|
||||||
|
self.rootpath = os.path.normpath(self.rootpath)
|
||||||
import vclib.svn
|
import vclib.svn
|
||||||
rev = None
|
rev = None
|
||||||
if self.query_dict.has_key('rev') \
|
if self.query_dict.has_key('rev') \
|
||||||
|
|
Loading…
Reference in New Issue