From 97b7d66ffd084597026b352196676516b4c64857 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 30 Jun 2021 13:20:53 +0200 Subject: [PATCH] Staging: add 'rebase' as an alias to the 'freeze' command Fixes issue #1947 --- docs/staging.asciidoc | 6 ++++-- osc-staging.py | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/docs/staging.asciidoc b/docs/staging.asciidoc index 2320011e..85218c87 100644 --- a/docs/staging.asciidoc +++ b/docs/staging.asciidoc @@ -92,7 +92,9 @@ are: * *cleanup_rings* Check the status of the different rings in Factory. -* *freeze* Freeze the packages that are not affected in a staging project. +* *rebase* Freeze the packages that are not affected in a staging project. + In the past, this command used to be called 'freeze', which is still + a valid alias. * *list* Accept all the requests from packages that are not in any ring, detect request that supersede the current ones that are @@ -230,7 +232,7 @@ This command is used to check the current status of the rings and to find undesirable dependencies of the packages that conform the rings. -Freeze +Rebase ~~~~~~ Factory (or the subset MinimalX) is always a moving target, even with diff --git a/osc-staging.py b/osc-staging.py index 050281c2..641f6c99 100644 --- a/osc-staging.py +++ b/osc-staging.py @@ -141,8 +141,8 @@ def do_staging(self, subcmd, opts, *args): "cleanup_rings" will try to cleanup rings content and print out problems - "freeze" will freeze the sources of the project's links while not - affecting the source packages + "rebase" (or "freeze") will freeze the sources of the project's links while + not affecting the source packages "frozenage" will show when the respective staging project was last frozen @@ -298,7 +298,7 @@ def do_staging(self, subcmd, opts, *args): osc staging check_duplicate_binaries osc staging check_local_links osc staging cleanup_rings - osc staging freeze [--no-bootstrap] STAGING... + osc staging rebase|freeze [--no-bootstrap] STAGING... osc staging frozenage [STAGING...] osc staging ignore [-m MESSAGE] REQUEST... osc staging unignore [--cleanup] [REQUEST...|all] @@ -340,6 +340,7 @@ def do_staging(self, subcmd, opts, *args): min_args, max_args = 0, None elif cmd in ( 'freeze', + 'rebase', 'setprio', 'ignore', ): @@ -408,7 +409,7 @@ def do_staging(self, subcmd, opts, *args): CheckDuplicateBinariesCommand(api).perform(opts.save) elif cmd == 'check_local_links': AcceptCommand(api).check_local_links() - elif cmd == 'freeze': + elif cmd == 'freeze' or cmd == 'rebase': for prj in args[1:]: prj = api.prj_from_short(prj) print(Fore.YELLOW + prj)