Show More
@@ -344,8 +344,8 b' class ScmModel(BaseModel):' | |||||
344 | self.sa.add(repo) |
|
344 | self.sa.add(repo) | |
345 | return repo |
|
345 | return repo | |
346 |
|
346 | |||
347 |
def pull_changes(self, repo |
|
347 | def pull_changes(self, repo, username): | |
348 |
dbrepo = |
|
348 | dbrepo = self.__get_repo(repo) | |
349 | clone_uri = dbrepo.clone_uri |
|
349 | clone_uri = dbrepo.clone_uri | |
350 | if not clone_uri: |
|
350 | if not clone_uri: | |
351 | raise Exception("This repository doesn't have a clone uri") |
|
351 | raise Exception("This repository doesn't have a clone uri") | |
@@ -356,7 +356,7 b' class ScmModel(BaseModel):' | |||||
356 | 'ip': '', |
|
356 | 'ip': '', | |
357 | 'username': username, |
|
357 | 'username': username, | |
358 | 'action': 'push_remote', |
|
358 | 'action': 'push_remote', | |
359 | 'repository': repo_name, |
|
359 | 'repository': repo.repo_name, | |
360 | 'scm': repo.alias, |
|
360 | 'scm': repo.alias, | |
361 | } |
|
361 | } | |
362 |
|
362 | |||
@@ -367,7 +367,7 b' class ScmModel(BaseModel):' | |||||
367 | repo.fetch(clone_uri) |
|
367 | repo.fetch(clone_uri) | |
368 | else: |
|
368 | else: | |
369 | repo.pull(clone_uri) |
|
369 | repo.pull(clone_uri) | |
370 | self.mark_for_invalidation(repo_name) |
|
370 | self.mark_for_invalidation(repo.repo_name) | |
371 | except: |
|
371 | except: | |
372 | log.error(traceback.format_exc()) |
|
372 | log.error(traceback.format_exc()) | |
373 | raise |
|
373 | raise |
General Comments 0
You need to be logged in to leave comments.
Login now