[CMF-checkins] CVS: CMF/CMFStaging - StagingTool.py:1.16

[Shane Hathaway]

Update of /cvs-repository/CMF/CMFStaging
In directory cvs.zope.org:/tmp/cvs-serv29531

Modified Files:
	StagingTool.py 
Log Message:
When updating a staged object, update the target, not the proxy.


=== CMF/CMFStaging/StagingTool.py 1.15 => 1.16 ===
--- CMF/CMFStaging/StagingTool.py:1.15	Fri Oct 31 15:53:27 2003
+++ CMF/CMFStaging/StagingTool.py	Fri Nov  7 16:33:51 2003
@@ -299,7 +299,7 @@
                             'The object "%s", backed by a different '
                             'version history than "%s", '
                             'is in the way.' % (p, p2))
-                    repo.updateResource(ob, version_id)
+                    repo.updateResource(unproxied(ob), version_id)
 
 
     def _updateReferences(self, proxy, container_map, to_stages):