diff options
author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2021-01-18 10:38:51 -0500 |
---|---|---|
committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2021-01-18 10:38:51 -0500 |
commit | f70a2d32ed01d8049e2599350d36b84d88c2e687 (patch) | |
tree | b1914d016e1e89120466ee337927da45e8948acc | |
parent | 2404c63870f79ab6368b5c231bc022fb1235607d (diff) | |
download | grokmirror-f70a2d32ed01d8049e2599350d36b84d88c2e687.tar.gz |
Don't objstore in dumb_pull
Let it call grok-manifest in the post hook and do it from there.
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
-rwxr-xr-x | grokmirror/dumb_pull.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/grokmirror/dumb_pull.py b/grokmirror/dumb_pull.py index 156a988..aba502d 100755 --- a/grokmirror/dumb_pull.py +++ b/grokmirror/dumb_pull.py @@ -109,19 +109,13 @@ def dumb_pull_repo(gitdir, remotes, svn=False): logger.info('Could not find any remotes matching %s in %s', remote, gitdir) new_revs = git_rev_parse_all(gitdir) + grokmirror.unlock_repo(gitdir) + if old_revs == new_revs: logger.debug('No new revs, no updates') - grokmirror.unlock_repo(gitdir) return False logger.debug('New revs found -- new content pulled') - - # store any new objects, if it's using objstore - altrepo = grokmirror.get_altrepo(gitdir) - if altrepo and grokmirror.is_obstrepo(altrepo): - logger.debug('Fetching into objstore') - grokmirror.fetch_objstore_repo(altrepo, gitdir) - grokmirror.unlock_repo(gitdir) return True |