Skip to content

Commit

Permalink
Fixes logic used to skip publishes based on predistributor.
Browse files Browse the repository at this point in the history
  • Loading branch information
dkliban committed Aug 1, 2016
1 parent 22aa7fa commit b7aeeac
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
5 changes: 0 additions & 5 deletions server/pulp/plugins/rsync/publish.py
Expand Up @@ -119,8 +119,6 @@ def make_authentication(self):
'/ssh_identity_file', 'hostname']
:rtype: list
"""
if self.get_config().flatten()["remote"]['auth_type'] == 'local':
return []
ssh_parts = []
for arg in self.make_ssh_cmd():
if " " in arg:
Expand Down Expand Up @@ -153,9 +151,6 @@ def make_destination(self, relative_path):
:return: str of the combination of user, host, and dir.
:rtype: str
"""
if self.get_config().flatten()["remote"]['auth_type'] == 'local':
return self.get_config().flatten()["remote"]['root']

user = self.get_config().flatten()["remote"]['ssh_user']
host = self.get_config().flatten()["remote"]['host']
remote_root = self.get_config().flatten()["remote"]['root']
Expand Down
4 changes: 3 additions & 1 deletion server/pulp/server/controllers/repository.py
Expand Up @@ -1006,7 +1006,9 @@ def check_publish(repo_obj, dist_id, dist_inst, transfer_repo, conduit, call_con
updated__gte=the_timestamp).count()
units_removed = last_unit_removed is not None and last_unit_removed > last_published
dist_updated = dist.last_updated > last_published
published_after_predistributor = True
published_after_predistributor = True
else:
published_after_predistributor = False
predistributor_id = call_config.get('predistributor_id')
if predistributor_id and last_published:
predistributor = model.Distributor.objects.get_or_404(repo_id=repo_obj.repo_id,
Expand Down

0 comments on commit b7aeeac

Please sign in to comment.