You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/08/21 19:35:09 UTC
[26/26] git commit: [#6580] Make SVN quieter when building snapshots
[#6580] Make SVN quieter when building snapshots
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/c2df59a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/c2df59a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/c2df59a7
Branch: refs/heads/cj/6580
Commit: c2df59a7061176994f8a5d261b309cae8c4db228
Parents: ce7baf3
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Wed Aug 21 14:58:31 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed Aug 21 17:34:30 2013 +0000
----------------------------------------------------------------------
Allura/allura/model/repository.py | 2 +-
Allura/allura/tests/unit/test_repo.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c2df59a7/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 9db3747..3fe5a80 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -740,7 +740,7 @@ def zipdir(source, zipfile, exclude=None):
# this is needed to get proper prefixes inside zip-file
working_dir = os.path.dirname(source)
source_fn = os.path.basename(source)
- command = [zipbin, '-r', zipfile, source_fn]
+ command = [zipbin, '-y', '-q', '-r', zipfile, source_fn]
if exclude:
command += ['-x', exclude]
p = Popen(command, cwd=working_dir, stdout=PIPE, stderr=PIPE)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c2df59a7/Allura/allura/tests/unit/test_repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_repo.py b/Allura/allura/tests/unit/test_repo.py
index 499f604..0cdd65a 100644
--- a/Allura/allura/tests/unit/test_repo.py
+++ b/Allura/allura/tests/unit/test_repo.py
@@ -299,13 +299,13 @@ class TestZipDir(unittest.TestCase):
src = '/fake/path/to/repo'
zipfile = '/fake/zip/file.tmp'
zipdir(src, zipfile)
- popen.assert_called_once_with(['/bin/zip', '-r', zipfile, 'repo'],
+ popen.assert_called_once_with(['/bin/zip', '-y', '-q', '-r', zipfile, 'repo'],
cwd='/fake/path/to', stdout=PIPE, stderr=PIPE)
popen.reset_mock()
src = '/fake/path/to/repo/'
zipdir(src, zipfile, exclude='file.txt')
popen.assert_called_once_with(
- ['/bin/zip', '-r', zipfile, 'repo', '-x', 'file.txt'],
+ ['/bin/zip', '-y', '-q', '-r', zipfile, 'repo', '-x', 'file.txt'],
cwd='/fake/path/to', stdout=PIPE, stderr=PIPE)
@patch('allura.model.repository.Popen')
@@ -321,7 +321,7 @@ class TestZipDir(unittest.TestCase):
emsg = str(cm.exception)
self.assertTrue(
"Command: "
- "['/bin/zip', '-r', '/fake/zip/file.tmp', 'repo'] "
+ "['/bin/zip', '-y', '-q', '-r', '/fake/zip/file.tmp', 'repo'] "
"returned non-zero exit code 1" in emsg)
self.assertTrue("STDOUT: 1" in emsg)
self.assertTrue("STDERR: 2" in emsg)