#2239 backend: search for comps.xml in chroot dir
Merged 2 years ago by praiskup. Opened 2 years ago by praiskup.
Unknown source comps-fix  into  main

file modified
+2 -2
@@ -135,9 +135,9 @@

          # this is because rhel-5 doesn't know sha256

          createrepo_cmd.extend(['-s', 'sha', '--checksum', 'md5'])

  

-     mb_comps_xml_path = os.path.join(opts.directory, "repodata", "comps.xml")

+     mb_comps_xml_path = os.path.join(opts.directory, "comps.xml")

      if os.path.exists(mb_comps_xml_path):

-         createrepo_cmd += ['--groupfile', mb_comps_xml_path, '--keep-all-metadata']

+         createrepo_cmd += ['--groupfile', mb_comps_xml_path]

  

      repodata_xml = os.path.join(opts.directory, 'repodata', 'repomd.xml')

      repodata_exist = os.path.exists(repodata_xml)

@@ -533,7 +533,7 @@

          ctx = f_third_build

          chroot = ctx.chroots[0]

          chrootdir = os.path.join(ctx.empty_dir, chroot)

-         copms_path = os.path.join(chrootdir, "repodata", "comps.xml")

+         copms_path = os.path.join(chrootdir, "comps.xml")

          with open(copms_path, "w"):

              pass

  

We are historically storing the comps.xml file onto the
'<chroot>/comps.xml' path, but run_createrepo() mistakenly searched for
path '<chroot>/repodata/comps.xml'.

Fixes: 968e302554c815de2ac94561fbc654e45f00fcfc.
Fixes: #1431

rebased onto 41e3e4f98a3e61278966a20f15e82386aca162a0

2 years ago

Build succeeded.

rebased onto a363126

2 years ago

Build succeeded.

Commit a818b6f fixes this pull-request

Pull-Request has been merged by praiskup

2 years ago

Commit a363126 fixes this pull-request

Pull-Request has been merged by praiskup

2 years ago

Pull-Request has been merged by praiskup

2 years ago