Skip to content

Commit

Permalink
- add makeoriginolder option in request actions
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianschroeter committed Jan 9, 2015
1 parent 8a70a0f commit 0d66a5b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions NEWS
Expand Up @@ -2,6 +2,7 @@
- add "osc api --edit" option to be able to edit some meta files directly
- follow the request order of the api (sorting according to priorization)
- add mr --release-project option for kgraft updates
- add support for makeoriginolder in request

0.149
- removed "--diff" option from the "createrequest" command
Expand Down
6 changes: 4 additions & 2 deletions osc/core.py
Expand Up @@ -2493,13 +2493,13 @@ class Action:
# allowed types + the corresponding (allowed) attributes
type_args = {'submit': ('src_project', 'src_package', 'src_rev', 'tgt_project', 'tgt_package', 'opt_sourceupdate',
'acceptinfo_rev', 'acceptinfo_srcmd5', 'acceptinfo_xsrcmd5', 'acceptinfo_osrcmd5',
'acceptinfo_oxsrcmd5', 'opt_updatelink'),
'acceptinfo_oxsrcmd5', 'opt_updatelink', 'opt_makeoriginolder'),
'add_role': ('tgt_project', 'tgt_package', 'person_name', 'person_role', 'group_name', 'group_role'),
'set_bugowner': ('tgt_project', 'tgt_package', 'person_name', 'group_name'),
'maintenance_release': ('src_project', 'src_package', 'src_rev', 'tgt_project', 'tgt_package', 'person_name',
'acceptinfo_rev', 'acceptinfo_srcmd5', 'acceptinfo_xsrcmd5', 'acceptinfo_osrcmd5',
'acceptinfo_oxsrcmd5'),
'maintenance_incident': ('src_project', 'src_package', 'src_rev', 'tgt_project', 'tgt_releaseproject', 'person_name', 'opt_sourceupdate'),
'maintenance_incident': ('src_project', 'src_package', 'src_rev', 'tgt_project', 'tgt_releaseproject', 'person_name', 'opt_sourceupdate', 'opt_makeoriginolder'),
'delete': ('tgt_project', 'tgt_package', 'tgt_repository'),
'change_devel': ('src_project', 'src_package', 'tgt_project', 'tgt_package'),
'group': ('grouped_id', )}
Expand Down Expand Up @@ -2766,6 +2766,8 @@ def prj_pkg_join(prj, pkg, repository=None):
if action.src_package == action.tgt_package:
tgt_package = ''
d['target'] = prj_pkg_join(action.tgt_project, tgt_package)
if action.opt_makeoriginolder:
d['target'] = d['target'] + ' ***makeoriginolder***'
elif action.type == 'add_role':
roles = []
if action.person_name and action.person_role:
Expand Down

0 comments on commit 0d66a5b

Please sign in to comment.