You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/05/16 20:34:13 UTC
[4/6] git commit: [#6232] ticket:351 Rename zip helper to zipdir to
avoid conflicts with built-in function
[#6232] ticket:351 Rename zip helper to zipdir to avoid conflicts with built-in function
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4057fb35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4057fb35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4057fb35
Branch: refs/heads/master
Commit: 4057fb352447518581e461da1cceaa9b8b8df65b
Parents: 3944f9a
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed May 15 10:25:50 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu May 16 18:28:19 2013 +0000
----------------------------------------------------------------------
Allura/allura/model/repository.py | 2 +-
ForgeSVN/forgesvn/model/svn.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4057fb35/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index f760e3e..37b95ab 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -1344,7 +1344,7 @@ def topological_sort(graph):
assert not graph, 'Cycle detected'
-def zip(source, zipfile, exclude=None):
+def zipdir(source, zipfile, exclude=None):
"""Create zip archive using zip binary."""
zipbin = tg.config.get('scm.repos.tarball.zip_binary', '/usr/bin/zip')
source = source.rstrip('/')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4057fb35/ForgeSVN/forgesvn/model/svn.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index 07ffb9c..bc4da97 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -42,7 +42,7 @@ from ming.utils import LazyProperty
from allura import model as M
from allura.lib import helpers as h
from allura.model.auth import User
-from allura.model.repository import zip
+from allura.model.repository import zipdir
log = logging.getLogger(__name__)
@@ -649,7 +649,7 @@ class SVNImplementation(M.RepositoryImplementation):
self._svn.export(self._url,
path,
revision=pysvn.Revision(pysvn.opt_revision_kind.number, commit))
- zip(path, tmpfilename)
+ zipdir(path, tmpfilename)
os.rename(tmpfilename, filename)
finally:
rmtree(path)