#213 Use --repo-refix-search and --repo-prefix-replace instead of --repo-prefix and --repo-prefix-url.
Merged 9 months ago by jkaluza. Opened 9 months ago by jkaluza.
jkaluza/odcs mergerepo-fix  into  master

@@ -154,8 +154,8 @@ 

  

              args = [mergerepo_exe, "--method", "nvr", "-o",

                      result_repo_dir]

-             args += ["--repo-prefix", os.path.join(conf.target_dir, "pulp_repo_cache")]

-             args += ["--repo-prefix-url", repo_prefix]

+             args += ["--repo-prefix-search", os.path.join(conf.target_dir, "pulp_repo_cache")]

+             args += ["--repo-prefix-replace", repo_prefix]

              for repo in repo_paths:

                  args.append("-r")

                  args.append(repo)

file modified
+4 -4

@@ -183,15 +183,15 @@ 

          execute_cmd.assert_any_call(

              ['/usr/bin/mergerepo_c', '--method', 'nvr', '-o',

               c.result_repo_dir + '/x86_64',

-              '--repo-prefix', '%s/pulp_repo_cache' % conf.target_dir,

-              '--repo-prefix-url', 'http://localhost/',

+              '--repo-prefix-search', '%s/pulp_repo_cache' % conf.target_dir,

+              '--repo-prefix-replace', 'http://localhost/',

               '-r', repo_prefix + "1.0/x86_64/os",

               '-r', repo_prefix + "1.1/x86_64/os"])

          execute_cmd.assert_any_call(

              ['/usr/bin/mergerepo_c', '--method', 'nvr', '-o',

               c.result_repo_dir + '/ppc64le',

-              '--repo-prefix', '%s/pulp_repo_cache' % conf.target_dir,

-              '--repo-prefix-url', 'http://localhost/',

+              '--repo-prefix-search', '%s/pulp_repo_cache' % conf.target_dir,

+              '--repo-prefix-replace', 'http://localhost/',

               '-r', repo_prefix + "1.0/ppc64le/os"])

  

          download_repodata.assert_any_call(

While merging mergerepo_c PR https://github.com/rpm-software-management/createrepo_c/pull/101 upstream, the upstream decided to choose different names for those two options, so sync up with upstream.

Pull-Request has been merged by jkaluza

9 months ago