From 5d5c1bb0aaa818465d480b90f7bce40dfb138bde Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Jan 02 2018 14:07:48 +0000 Subject: ostree/utils: Drop timestamps from generated repo names Since we drop these files in a separate workdir each time, there's no need to datestamp them. Doing so is part of the cause for invalidating's rpm-ostree input change hashing. Issue: https://pagure.io/pungi/issue/811 Signed-off-by: Colin Walters --- diff --git a/pungi/ostree/utils.py b/pungi/ostree/utils.py index 4c52fd2..a877738 100644 --- a/pungi/ostree/utils.py +++ b/pungi/ostree/utils.py @@ -86,21 +86,17 @@ def tweak_treeconf(treeconf, source_repos=None, keep_original_sources=False, upd Additionally, other values can be passed to method by 'update_dict' parameter to update treefile content. """ - # add this timestamp to repo name to get unique repo filename and repo name - # should be safe enough - time = datetime.datetime.now().strftime("%Y%m%d%H%M%S") - treeconf_dir = os.path.dirname(treeconf) with open(treeconf, 'r') as f: treeconf_content = json.load(f) # backup the old tree config - os.rename(treeconf, '%s.%s.bak' % (treeconf, time)) + os.rename(treeconf, '{}.bak'.format(treeconf)) repos = [] if source_repos: for repo in source_repos: - name = "%s-%s" % (repo['name'], time) + name = repo['name'] _write_repofile("%s/%s.repo" % (treeconf_dir, name), name, repo) repos.append(name)