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

Fred L. Drake, Jr. fred at zope.com
Tue May 11 00:41:35 EDT 2004


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

Modified Files:
	app.py 
Log Message:
when loading a component that needs to load external references, and
the mutable copy isn't the same as the initial copy, we need to make
sure the specification objects for the inclusion processor are
re-computed

XXX needs tests!


=== Packages/zpkgtools/zpkgtools/app.py 1.58 => 1.59 ===
--- Packages/zpkgtools/zpkgtools/app.py:1.58	Fri May  7 16:47:27 2004
+++ Packages/zpkgtools/zpkgtools/app.py	Tue May 11 00:41:32 2004
@@ -309,7 +309,13 @@
         self.source = self.ip.loader.load(self.url)
         specs = include.load(self.source, url=self.url)
         if specs.loads:
-            self.source = self.ip.loader.load_mutable_copy(self.url)
+            source = self.ip.loader.load_mutable_copy(self.url)
+            if source != self.source:
+                self.source = source
+                # we need to re-load the specs to get the .source
+                # attribute of the specification objects correct
+                # XXX need test!
+                specs = include.load(source, url=self.url)
             self.ip.addIncludes(self.source, specs.loads)
         specs.collection.cook()
         specs.distribution.cook()




More information about the Zope-CVS mailing list