From af631f560eff24e4631cd566f2566c2717b6f62c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 26 Jun 2017 17:43:00 -0400 Subject: [PATCH] ostree: Don't automatically create a repo Creating an OSTree repository is a notable event; the general expectation is that rather than having lots of repositories, one has branches inside a single repository. For $reasons, Fedora is not currently doing this, but we will change it to do so. The reason I'm making this change is we discovered that it looked like Fedora had somehow made a repo inside a repo, presumably due to a configuration error. https://lists.fedoraproject.org/archives/list/cloud@lists.fedoraproject.org/message/GBFSOLULGGZFGEFCIW6FG23NZZV5VH4K/ Signed-off-by: Colin Walters --- pungi/ostree/tree.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pungi/ostree/tree.py b/pungi/ostree/tree.py index abe9fe92..96f0b622 100644 --- a/pungi/ostree/tree.py +++ b/pungi/ostree/tree.py @@ -25,14 +25,6 @@ from .utils import (make_log_file, tweak_treeconf, class Tree(OSTree): - def _init_repo(self): - """If the ostree repo does not exist, initialize it.""" - log_file = make_log_file(self.logdir, 'init-ostree-repo') - if not os.path.isdir(self.repo) or not os.listdir(self.repo): - makedirs(self.repo) - shortcuts.run(['ostree', 'init', '--repo=%s' % self.repo, '--mode=archive-z2'], - show_cmd=True, stdout=True, logfile=log_file) - def _make_tree(self): """Compose OSTree tree""" log_file = make_log_file(self.logdir, 'create-ostree-repo') @@ -95,7 +87,6 @@ class Tree(OSTree): self.commitid_file = make_log_file(self.logdir, 'commitid') - self._init_repo() self._make_tree() self._update_ref() if self.update_summary: