[Zope-CVS] CVS: Packages/zpkgtools/zpkgtools - locationmap.py:1.5

[Fred L. Drake, Jr.]

Update of /cvs-repository/Packages/zpkgtools/zpkgtools
In directory cvs.zope.org:/tmp/cvs-serv15200

Modified Files:
	locationmap.py 
Log Message:
fromPathOrUrl():  when reading from CVS, fix up the base so
    repository: URLs are resolved correctly


=== Packages/zpkgtools/zpkgtools/locationmap.py 1.4 => 1.5 ===
--- Packages/zpkgtools/zpkgtools/locationmap.py:1.4	Wed Mar 10 15:43:30 2004
+++ Packages/zpkgtools/zpkgtools/locationmap.py	Wed Mar 10 15:48:15 2004
@@ -121,11 +121,13 @@
         f = open(path, "rU")
     else:
         try:
-            cvsloader.parse(path)
+            cvsurl = cvsloader.parse(path)
         except ValueError:
             f = urllib2.urlopen(path)
         else:
             f = cvsloader.open(path, "rU")
+            cvsurl.path = posixpath.dirname(cvsurl.path)
+            base = cvsurl.getUrl()
     try:
         return load(f, base, mapping)
     finally: