#1499 remove merge option from edit-external-repo
Merged 2 years ago by mikem. Opened 2 years ago by tkopecek.
tkopecek/koji issue1404b  into  master

@@ -5442,7 +5442,6 @@ 

      parser = OptionParser(usage=usage)

      parser.add_option("--url",  help=_("Change the url"))

      parser.add_option("--name",  help=_("Change the name"))

-     parser.add_option("-m", "--mode", help=_("Set merge mode"))

      (options, args) = parser.parse_args(args)

      if len(args) != 1:

          parser.error(_("Incorrect number of arguments"))
@@ -5453,10 +5452,6 @@ 

          opts['url'] = options.url

      if options.name:

          opts['name'] = options.name

-     if options.mode:

-         if options.mode not in koji.REPO_MERGE_MODES:

-             parser.error('Invalid mode: %s' % options.mode)

-         opts['merge_mode'] = options.mode

      if not opts:

          parser.error(_("No changes specified"))

      activate_session(session, goptions)

Related: https://pagure.io/koji/issue/1404

It is not valid place for passing this option (merge mode is related to combination of tag/repo, not repo itself). Also API doesn't support this option.

Ah, I think we changed the approach midway during #1066

Commit 3b0028a fixes this pull-request

Pull-Request has been merged by mikem

2 years ago