Skip to content

Fix publish dump/restore #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fpytloun merged 1 commit into from
Jan 29, 2018
Merged

Fix publish dump/restore #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions aptly/publisher/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ def dump_publishes(self, publishes_to_save, dump_dir, prefix):
raise Exception('Publish(es) required not found')

for publish in save_list:
save_path = ''.join([dump_dir, '/', prefix, publish.name.replace('/', '-'), '.yml'])
storage = '' if not publish.storage else '-{}-'.format(publish.storage)
save_path = ''.join([dump_dir, '/', prefix, storage, publish.name.replace('/', '-'), '.yml'])
publish.save_publish(save_path)

def _publish_match(self, publish, names=False, name_only=False):
Expand Down Expand Up @@ -481,7 +482,8 @@ def restore_publish(self, config, components, recreate=False):

to_publish.append(component_name)

snapshot_name = '{}-{}'.format("restored", saved_component.get('snapshot'))
timestamp = time.strftime("%Y%m%d%H%M%S")
snapshot_name = '{}-{}-{}'.format("restored", timestamp, saved_component.get('snapshot'))
lg.debug("Creating snapshot %s for component %s of packages: %s"
% (snapshot_name, component_name, saved_packages))

Expand Down