diff options
author | Ben Brown <ben.brown@codethink.co.uk> | 2020-08-03 08:17:48 +0000 |
---|---|---|
committer | Ben Brown <ben.brown@codethink.co.uk> | 2020-08-03 08:17:48 +0000 |
commit | ab010fb032b7f75212140ecb7b31e1a96f50a621 (patch) | |
tree | 4381027ca9508d79caa788e41da0ec118cdf91a5 /lorrycontroller/gitlab.py | |
parent | 6e1b4a4363149230dfac57157d894b1fd5528db7 (diff) | |
parent | 68f21f0475e83f839bd8e25de482d1aa60582edd (diff) | |
download | lorry-controller-ab010fb032b7f75212140ecb7b31e1a96f50a621.tar.gz |
Merge branch 'bwh/single-lorry-metadata' into 'master'
Add metadata for single repositories
Closes #15
See merge request CodethinkLabs/lorry/lorry-controller!17
Diffstat (limited to 'lorrycontroller/gitlab.py')
-rw-r--r-- | lorrycontroller/gitlab.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lorrycontroller/gitlab.py b/lorrycontroller/gitlab.py index 0b5e1c2..266861c 100644 --- a/lorrycontroller/gitlab.py +++ b/lorrycontroller/gitlab.py @@ -76,13 +76,22 @@ class GitlabDownstream(hosts.DownstreamHost): else: logging.info('Project %s exists in local GitLab already.', repo_path) - if 'head' in metadata \ - and project.default_branch != metadata['head']: - project.default_branch = metadata['head'] + if 'description' in metadata \ and project.description != metadata['description']: project.description = metadata['description'] project.save() + + # This will fail if we haven't created the branch yet. + # We'll fix it next time round. + try: + if 'head' in metadata \ + and project.default_branch != metadata['head']: + project.default_branch = metadata['head'] + project.save() + except gitlab.GitlabUpdateError: + pass + return path_comps = repo_path.split('/') |