From 4e2a1a8ba253eecc1e49e3551f48b7ae3e155881 Mon Sep 17 00:00:00 2001 From: Christophe Dumez <christophe@nexedi.com> Date: Thu, 18 May 2006 11:55:33 +0000 Subject: [PATCH] - fixed a typo in export function - do not use export function anymore (makes zope crash :'( ) git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7343 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5Subversion/SubversionClient.py | 2 +- product/ERP5Subversion/Tool/SubversionTool.py | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/product/ERP5Subversion/SubversionClient.py b/product/ERP5Subversion/SubversionClient.py index f3ba0f9781..6cc9e40401 100644 --- a/product/ERP5Subversion/SubversionClient.py +++ b/product/ERP5Subversion/SubversionClient.py @@ -227,7 +227,7 @@ try: raise error def export(self, src, dest): - return self.client.update(src_url_or_path=src, dest_path=dest) + return self.client.export(src_url_or_path=src, dest_path=dest) def update(self, path): try: diff --git a/product/ERP5Subversion/Tool/SubversionTool.py b/product/ERP5Subversion/Tool/SubversionTool.py index f549d38999..a2c3ed087d 100644 --- a/product/ERP5Subversion/Tool/SubversionTool.py +++ b/product/ERP5Subversion/Tool/SubversionTool.py @@ -965,15 +965,7 @@ class SubversionTool(BaseTool, UniqueObject, Folder): self.activate().removeAllInList([path,]) def importBT(self, bt): - # Do svn export before importing to get rid of .svn stuff - # and unversioned files. - tmp_path = mktemp() + os.sep - self.export(self._getWorkingPath(self.getSubversionPath(bt)), tmp_path) - # Import - id = bt.download(tmp_path) - # Clean up - self.activate().removeAllInList([tmp_path,]) - return id + return bt.download(self._getWorkingPath(self.getSubversionPath(bt))) # Get a list of files and keep only parents # Necessary before recursively commit removals -- 2.30.9