From 27a6772dce1de4baea35451322303bbed6dc50b4 Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Sat, 18 Feb 2017 00:03:55 -0600 Subject: [PATCH] request_splitter: add strategy_do_non_bootstrapped(). Utilize in select command to fallback to none strategy and also excluded packages that require bootstrapping. --- osc-staging.py | 1 + osclib/request_splitter.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/osc-staging.py b/osc-staging.py index f89aca72..85742e09 100644 --- a/osc-staging.py +++ b/osc-staging.py @@ -371,6 +371,7 @@ def do_staging(self, subcmd, opts, *args): # Merge any none strategies before final none strategy. splitter.merge(strategy_none=True) splitter.strategy_do('none') + splitter.strategy_do_non_bootstrapped('none') proposal = splitter.proposal if len(proposal) == 0: diff --git a/osclib/request_splitter.py b/osclib/request_splitter.py index e75e1ffe..1d5f8abc 100644 --- a/osclib/request_splitter.py +++ b/osclib/request_splitter.py @@ -298,6 +298,12 @@ class RequestSplitter(object): self.split() self.propose_assignment() + def strategy_do_non_bootstrapped(self, name, **kwargs): + self.strategy_set(name, **kwargs) + self.filter_add('./action/target[not(starts-with(@ring, "0"))]') + self.split() + self.propose_assignment() + def filter_grouped(self, groups): for group in sorted(self.grouped.keys()): if group not in groups: