[Zope-CVS] CVS: Packages/zpkgtools/zpkgtools - app.py:1.47

[Fred L. Drake, Jr.]

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

Modified Files:
	app.py 
Log Message:
build_package_distribution():
- always pass the base URL to zpkgtools.include.load()
- use an already-computed directory name instead of computing it twice


=== Packages/zpkgtools/zpkgtools/app.py 1.46 => 1.47 ===
--- Packages/zpkgtools/zpkgtools/app.py:1.46	Mon May  3 13:09:23 2004
+++ Packages/zpkgtools/zpkgtools/app.py	Mon May  3 14:02:20 2004
@@ -111,7 +111,7 @@
     def build_package_distribution(self):
         pkgname = self.metadata.name
         pkgdest = os.path.join(self.destination, pkgname)
-        specs = include.load(self.source)
+        specs = include.load(self.source, url=self.resource_url)
         self.ip.addIncludes(self.source, specs.loads)
         specs.collection.cook()
         specs.distribution.cook()
@@ -120,8 +120,7 @@
         except zpkgtools.LoadingError, e:
             self.error(str(e))
         self.ip.addIncludes(self.destination, specs.distribution)
-        pkgdir = os.path.join(self.destination, pkgname)
-        pkginfo = package.loadPackageInfo(pkgname, pkgdir, pkgname)
+        pkginfo = package.loadPackageInfo(pkgname, pkgdest, pkgname)
         setup_cfg = os.path.join(self.destination, "setup.cfg")
         if not os.path.exists(setup_cfg):
             # only generate setup.cfg if it doesn't exist already