Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2023-01-25 17:44:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osc" Wed Jan 25 17:44:18 2023 rev:169 rq:1060883 version:1.0.0~b3 Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2023-01-18 17:11:36.815964105 +0100 +++ /work/SRC/openSUSE:Factory/.osc.new.32243/osc.changes 2023-01-25 17:51:54.254858955 +0100 @@ -1,0 +2,6 @@ +Wed Jan 25 10:48:38 UTC 2023 - Dirk Müller <[email protected]> + +- add 1228.patch to fix regressions in get_request_list +- add 1217.patch to fix correct variable (prj instead of project) + +------------------------------------------------------------------- New: ---- 1217.patch 1228.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.FMqq7x/_old 2023-01-25 17:51:54.866862222 +0100 +++ /var/tmp/diff_new_pack.FMqq7x/_new 2023-01-25 17:51:54.870862243 +0100 @@ -62,7 +62,8 @@ Source1: debian.dirs Source2: debian.docs %endif - +Patch1: https://github.com/openSUSE/osc/pull/1228.patch +Patch2: https://github.com/openSUSE/osc/pull/1217.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ 1217.patch ++++++ >From 18cdec255404dc0d63b81e77107636f8f5db79f2 Mon Sep 17 00:00:00 2001 From: lethliel <[email protected]> Date: Fri, 20 Jan 2023 10:10:50 +0100 Subject: [PATCH] use correct variable prj instead of project --- behave/features/rdelete.feature | 6 ++++++ osc/core.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 behave/features/rdelete.feature diff --git a/behave/features/rdelete.feature b/behave/features/rdelete.feature new file mode 100644 index 000000000..df26a25fc --- /dev/null +++ b/behave/features/rdelete.feature @@ -0,0 +1,6 @@ +Feature: `osc rdelete` command + +@destructive +Scenario: Run `osc rdelete` to delete a project and mark it with a desctructive tag + When I execute osc with args "rdelete -r -f test:factory -m 'cleanup'" + Then the exit code is 0 diff --git a/osc/core.py b/osc/core.py index 6a86901b1..59d3f4fdb 100644 --- a/osc/core.py +++ b/osc/core.py @@ -6073,7 +6073,7 @@ def delete_package(apiurl: str, prj: str, pac: str, force=False, msg=None): def delete_project(apiurl: str, prj: str, force=False, msg=None, recursive=False): if not recursive: - packages = meta_get_packagelist(apiurl, project) + packages = meta_get_packagelist(apiurl, prj) if packages: error_msg = \ "Project contains packages. It must be empty before deleting it. " \ ++++++ 1228.patch ++++++ >From 732ff678e789e7624e6d15b2ad641dba3828e4d7 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Wed, 25 Jan 2023 11:38:08 +0100 Subject: [PATCH] Fix osc.get_request_list ignoring the req_type parameter --- osc/core.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/osc/core.py b/osc/core.py index 0e8d027ac..bdce9e94c 100644 --- a/osc/core.py +++ b/osc/core.py @@ -4741,6 +4741,9 @@ def get_request_list( "states": req_state, } + if req_type is not None: + kwargs["types"] = [req_type] + assert not exclude_target_projects, "unsupported" assert not withfullhistory, "unsupported"
