You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by Mark Thomas <ma...@apache.org> on 2016/04/16 20:24:36 UTC
Re: svn commit: r1728586 - /gump/live/python/gump/core/update/git.py
On 05/02/2016 01:58, billbarker@apache.org wrote:
> Author: billbarker
> Date: Fri Feb 5 01:58:25 2016
> New Revision: 1728586
>
> URL: http://svn.apache.org/viewvc?rev=1728586&view=rev
> Log:
> revert previous attempt. We can go back to fixing corrupt files the old fashoned way. Thanks to Konstantin for pointing out my stupidity
I'm wondering if the build is playing with line-endings.
I've just forced:
git fetch --all
git reset --hard origin/master
for commons-lang-trunk
I took a look at git.py but my Python fu is pretty poor and I couldn't
see how to get two commands to be executed for getUpdateCommand. Any
pointers?
Cheers,
Mark
>
> Modified:
> gump/live/python/gump/core/update/git.py
>
> Modified: gump/live/python/gump/core/update/git.py
> URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/update/git.py?rev=1728586&r1=1728585&r2=1728586&view=diff
> ==============================================================================
> --- gump/live/python/gump/core/update/git.py (original)
> +++ gump/live/python/gump/core/update/git.py Fri Feb 5 01:58:25 2016
> @@ -66,7 +66,6 @@ class GitUpdater(ScmUpdater):
> cmd = Cmd('git', 'update_' + module.getName(),
> module.getSourceControlStagingDirectory())
> cmd.addParameter('pull')
> - cmd.addParameter('--commit')
> maybe_make_quiet(module, cmd)
> cmd.addParameter(module.getScm().getRootUrl())
> cmd.addParameter(module.getScm().getBranch())
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org
Re: svn commit: r1728586 - /gump/live/python/gump/core/update/git.py
Posted by Stefan Bodewig <bo...@apache.org>.
On 2016-04-17, Stefan Bodewig wrote:
> On 2016-04-16, Mark Thomas wrote:
>> I'm wondering if the build is playing with line-endings.
> If so, it may help to remove the working copy and force a fresh clone.
Just removed it.
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org
Re: svn commit: r1728586 - /gump/live/python/gump/core/update/git.py
Posted by Stefan Bodewig <bo...@apache.org>.
On 2016-04-16, Mark Thomas wrote:
> I'm wondering if the build is playing with line-endings.
If so, it may help to remove the working copy and force a fresh clone.
> I've just forced:
> git fetch --all
> git reset --hard origin/master
> for commons-lang-trunk
> I took a look at git.py but my Python fu is pretty poor and I couldn't
> see how to get two commands to be executed for getUpdateCommand. Any
> pointers?
You can't.
When I added support for submodules I added the post-process stage for
this, it may be best to allow a list of post-process commands rather
than just one and add the reset command there. The alternative is to
override updateModule entirely.
I'll give the list-version a try.
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org