yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Staging: add 'rebase' as an alias to the 'freeze' command

Browse Source 
Fixes issue #1947
This commit is contained in:
Dominique Leuenberger 2021-06-30 13:20:53 +02:00
parent 2c4d242c05
commit 97b7d66ffd
Signed by untrusted user: dimstar
GPG Key ID: 14C1CBBAC1E4B014
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/staging.asciidoc
View File

@ -92,7 +92,9 @@ are:
* *cleanup_rings* Check the status of the different rings in Factory. * *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 * *list* Accept all the requests from packages that are not in any
ring, detect request that supersede the current ones that are 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. find undesirable dependencies of the packages that conform the rings.
Freeze Rebase
~~~~~~ ~~~~~~
Factory (or the subset MinimalX) is always a moving target, even with Factory (or the subset MinimalX) is always a moving target, even with

9
osc-staging.py
View File

@ -141,8 +141,8 @@ def do_staging(self, subcmd, opts, *args):
"cleanup_rings" will try to cleanup rings content and print "cleanup_rings" will try to cleanup rings content and print
out problems out problems
"freeze" will freeze the sources of the project's links while not "rebase" (or "freeze") will freeze the sources of the project's links while
affecting the source packages not affecting the source packages
"frozenage" will show when the respective staging project was last frozen "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_duplicate_binaries
osc staging check_local_links osc staging check_local_links
osc staging cleanup_rings osc staging cleanup_rings
osc staging freeze [--no-bootstrap] STAGING... osc staging rebase|freeze [--no-bootstrap] STAGING...
osc staging frozenage [STAGING...] osc staging frozenage [STAGING...]
osc staging ignore [-m MESSAGE] REQUEST... osc staging ignore [-m MESSAGE] REQUEST...
osc staging unignore [--cleanup] [REQUEST...|all] osc staging unignore [--cleanup] [REQUEST...|all]
@ -340,6 +340,7 @@ def do_staging(self, subcmd, opts, *args):
min_args, max_args = 0, None min_args, max_args = 0, None
elif cmd in ( elif cmd in (
'freeze', 'freeze',
'rebase',
'setprio', 'setprio',
'ignore', 'ignore',
): ):
@ -408,7 +409,7 @@ def do_staging(self, subcmd, opts, *args):
CheckDuplicateBinariesCommand(api).perform(opts.save) CheckDuplicateBinariesCommand(api).perform(opts.save)
elif cmd == 'check_local_links': elif cmd == 'check_local_links':
AcceptCommand(api).check_local_links() AcceptCommand(api).check_local_links()
elif cmd == 'freeze': elif cmd == 'freeze' or cmd == 'rebase':
for prj in args[1:]: for prj in args[1:]:
prj = api.prj_from_short(prj) prj = api.prj_from_short(prj)
print(Fore.YELLOW + prj) print(Fore.YELLOW + prj)