Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/252927
Change subject: Refresh patch for zuul-cloner --cache-no-hardlinks ...................................................................... Refresh patch for zuul-cloner --cache-no-hardlinks 0005-Cloner-Implement-cache-no-hardlinks-argument.patch to latest upstream version https://review.openstack.org/#/c/117626/11 Bump wmf version. Change-Id: Ic4e84af30dc2bedce39bbd82cbedd598695c876e --- M debian/changelog M debian/patches/0005-Cloner-Implement-cache-no-hardlinks-argument.patch 2 files changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul refs/changes/27/252927/1 diff --git a/debian/changelog b/debian/changelog index c722357..59c4ff1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +zuul (2.1.0-60-g1cc37f7-wmf2precise1) precise-wikimedia; urgency=medium + + * Refresh patch 0005-Cloner-Implement-cache-no-hardlinks-argument.patch to + latest upstream version https://review.openstack.org/#/c/117626/11 + + -- Antoine Musso <[email protected]> Fri, 13 Nov 2015 14:15:50 +0100 + zuul (2.1.0-60-g1cc37f7-wmf1precise1) precise-wikimedia; urgency=medium * Bump upstream from 3ebedde to 1cc37f7 diff --git a/debian/patches/0005-Cloner-Implement-cache-no-hardlinks-argument.patch b/debian/patches/0005-Cloner-Implement-cache-no-hardlinks-argument.patch index 7eb35d5..a2b91fb 100644 --- a/debian/patches/0005-Cloner-Implement-cache-no-hardlinks-argument.patch +++ b/debian/patches/0005-Cloner-Implement-cache-no-hardlinks-argument.patch @@ -1,4 +1,4 @@ -From: Antoine Musso <[email protected]> +From: Timo Tijhof <[email protected]> Date: Thu, 28 Aug 2014 23:08:38 +0200 Subject: Cloner: Implement cache-no-hardlinks argument @@ -14,12 +14,12 @@ Change-Id: Ib8796f9dc5ccfeac4a3c9b3d30629c7db0f84739 --- doc/source/cloner.rst | 5 +++++ - zuul/cmd/cloner.py | 4 ++++ + zuul/cmd/cloner.py | 5 +++++ zuul/lib/cloner.py | 11 ++++++++--- - 3 files changed, 17 insertions(+), 3 deletions(-) + 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/doc/source/cloner.rst b/doc/source/cloner.rst -index 2ddf0b5..cb24d12 100644 +index 2ddf0b5..60c8764 100644 --- a/doc/source/cloner.rst +++ b/doc/source/cloner.rst @@ -87,3 +87,8 @@ cloning any projects it processes from those found in that directory. @@ -28,11 +28,11 @@ repository has all the information in the upstream repository. + +The ``--cache-no-hardlinks`` option can be used to force git to -+always copy git objects from the cache direcotry. By default, if ++always copy git objects from the cache directory. By default, if +the cache directory is on the same disk as the workspace, git-clone +will hardlink git objects to speed up the process and save space. diff --git a/zuul/cmd/cloner.py b/zuul/cmd/cloner.py -index 09bda3e..8754f6a 100755 +index 09bda3e..5e42e72 100755 --- a/zuul/cmd/cloner.py +++ b/zuul/cmd/cloner.py @@ -54,6 +54,9 @@ def parse_arguments(self): @@ -40,6 +40,7 @@ 'repos from which to make an initial clone.' )) + parser.add_argument('--cache-no-hardlinks', dest='cache_no_hardlinks', ++ action='store_true', + help=('force git-clone to never use hardlinks when' + 'fetching from the cache directory.')) parser.add_argument('git_base_url', @@ -49,7 +50,7 @@ clone_map_file=self.args.clone_map_file, project_branches=project_branches, cache_dir=self.args.cache_dir, -+ cache_no_hardlinks=self.args.cache_no_hardlinks ++ cache_no_hardlinks=self.args.cache_no_hardlinks, ) cloner.execute() -- To view, visit https://gerrit.wikimedia.org/r/252927 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4e84af30dc2bedce39bbd82cbedd598695c876e Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul Gerrit-Branch: debian/precise-wikimedia Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
