Commit ab3bdcfb authored by Cédric de Saint Martin's avatar Cédric de Saint Martin

gitclone: don't do anything at update() if develop=true.

parent 7b1548ea
......@@ -242,27 +242,21 @@ class Recipe(object):
If user doesn't develop, reset to remote revision (or branch if revision is
not specified).
"""
try:
# first cleanup pyc files
self.deletePycFiles(self.location)
if self.develop:
return
# then update
check_call([self.git_command, 'fetch', '--all'], cwd=self.location)
# first cleanup pyc files
self.deletePycFiles(self.location)
# If develop parameter is set, don't reset/update.
# Otherwise, reset --hard
if not self.develop:
if self.revision:
self.gitReset(self.revision)
else:
self.gitReset('@{upstream}')
except:
if not self.develop:
raise
# Buildout will remove the installed location and mark the part as not
# installed if an error occurs during update. If we are developping this
# repository we do not want this to happen.
print 'Unable to update:\n%s' % traceback.format_exc()
# then update
check_call([self.git_command, 'fetch', '--all'], cwd=self.location)
# If develop parameter is set, don't reset/update.
# Otherwise, reset --hard
if self.revision:
self.gitReset(self.revision)
else:
self.gitReset('@{upstream}')
def uninstall(name, options):
"""Keep the working copy, unless develop is set to false.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment