[Zope-CVS] CVS: Packages/zpkgtools/zpkgtools - app.py:1.51
package.py:1.12 setup.py:1.16
Fred L. Drake, Jr.
fred at zope.com
Tue May 4 18:03:10 EDT 2004
Update of /cvs-repository/Packages/zpkgtools/zpkgtools
In directory cvs.zope.org:/tmp/cvs-serv26738/zpkgtools
Modified Files:
app.py package.py setup.py
Log Message:
zpkgtools.package.loadCollectionInfo() should take reldir as well
=== Packages/zpkgtools/zpkgtools/app.py 1.50 => 1.51 ===
--- Packages/zpkgtools/zpkgtools/app.py:1.50 Tue May 4 16:15:35 2004
+++ Packages/zpkgtools/zpkgtools/app.py Tue May 4 18:02:39 2004
@@ -319,7 +319,7 @@
if self.is_python_package():
return package.loadPackageInfo(self.name, destdir, self.name)
else:
- return package.loadCollectionInfo(destdir)
+ return package.loadCollectionInfo(destdir, self.name)
def get_publication_info(self):
if self.pubinfo is None:
=== Packages/zpkgtools/zpkgtools/package.py 1.11 => 1.12 ===
--- Packages/zpkgtools/zpkgtools/package.py:1.11 Mon Apr 19 13:16:37 2004
+++ Packages/zpkgtools/zpkgtools/package.py Tue May 4 18:02:39 2004
@@ -99,16 +99,19 @@
return pkginfo
-def loadCollectionInfo(directory):
+def loadCollectionInfo(directory, reldir):
"""Load package information for a collection.
:return: Package information object.
:Parameters:
- `directory`: Directory containing the collection's files.
+ - `reldir`: Relative directory path with which file names from
+ the information file will be joined. This should be in POSIX
+ notation. It will not be used to locate files.
"""
- pkginfo = read_package_info(directory)
+ pkginfo = read_package_info(directory, reldir)
if pkginfo.extension:
raise ValueError("extensions cannot be defined in collections")
pkginfo.extensions = []
=== Packages/zpkgtools/zpkgtools/setup.py 1.15 => 1.16 ===
--- Packages/zpkgtools/zpkgtools/setup.py:1.15 Wed Apr 7 18:00:13 2004
+++ Packages/zpkgtools/zpkgtools/setup.py Tue May 4 18:02:39 2004
@@ -158,15 +158,15 @@
def __init__(self, pkgname, version, setup_file,
packages=(), collections=()):
SetupContext.__init__(self, pkgname, version, setup_file)
+ reldir = posixpath.join(name, name)
for name in packages:
pkgdir = os.path.join(self._working_dir, name, name)
- reldir = posixpath.join(name, name)
self.scan_package(name, pkgdir, reldir)
for name in collections:
pkgdir = os.path.join(self._working_dir, name, name)
- self.scan_collection(name, pkgdir)
+ self.scan_collection(name, pkgdir, reldir)
- def scan_collection(self, name, directory):
+ def scan_collection(self, name, directory, reldir):
# load the collection metadata
- pkginfo = package.loadCollectionInfo(directory)
+ pkginfo = package.loadCollectionInfo(directory, reldir)
self.scripts.extend(pkginfo.script)
More information about the Zope-CVS
mailing list