From 61645c6cd92edf1efcb4c529af1fa36f7fd0167e Mon Sep 17 00:00:00 2001 From: Joe Simmons-Talbott Date: Wed, 22 Sep 2021 10:55:23 -0400 Subject: [PATCH] kojira: make 'ignore_other_volumes' a config only option. * pull 'DEFAULT' repo handling out of the loop. * Add 'ignore_other_volumes' to kojira.conf --- util/kojira | 10 +++++----- util/kojira.conf | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/util/kojira b/util/kojira index fcc63903..246d5aef 100755 --- a/util/kojira +++ b/util/kojira @@ -643,12 +643,14 @@ class RepoManager(object): session.logout() def pruneLocalRepos(self): + volname = 'DEFAULT' + volumedir = pathinfo.volumedir(volname) + repodir = "%s/repos" % volumedir + self._pruneLocalRepos(repodir, self.options.deleted_repo_lifetime) + for volinfo in self.session.listVolumes(): volname = volinfo['name'] volumedir = pathinfo.volumedir(volname) - if volname == 'DEFAULT': # currently the only path for non-dist repos. - repodir = "%s/repos" % volumedir - self._pruneLocalRepos(repodir, self.options.deleted_repo_lifetime) distrepodir = "%s/repos-dist" % volumedir self._pruneLocalRepos(distrepodir, self.options.dist_repo_lifetime) @@ -1209,8 +1211,6 @@ def get_options(): parser.add_option("--logfile", help="Specify logfile") parser.add_option("--queue-file", help="If specified, queue is dumped to separate status file each cycle") - parser.add_option("--ignore-other-volumes", action="store_true", - help="Ignore repos on other volumes") (options, args) = parser.parse_args() config = koji.read_config_files(options.configFile) diff --git a/util/kojira.conf b/util/kojira.conf index e3bb2d08..31160fc6 100644 --- a/util/kojira.conf +++ b/util/kojira.conf @@ -46,3 +46,6 @@ logfile=/var/log/kojira.log ; as otherwise you can end with weird behaviour. For details see ; https://pagure.io/koji/issue/2159 ; check_external_repos = false + +; don't attempt to remove repos on non-default volumes +; ignore_other_volumes = false