createrepo: Don't use existing metadata with deltas
When creating the final repo, we reuse metadata from arch repo used for depsolving. This however breaks creating deltas with createrepo_c. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
parent
4d117d17f8
commit
a831d65c40
@ -145,6 +145,11 @@ def create_variant_repo(compose, arch, variant, pkg_type):
|
|||||||
f.write("%s\n" % rel_path)
|
f.write("%s\n" % rel_path)
|
||||||
|
|
||||||
old_package_dirs = _get_old_package_dirs(compose, repo_dir)
|
old_package_dirs = _get_old_package_dirs(compose, repo_dir)
|
||||||
|
if old_package_dirs:
|
||||||
|
# If we are creating deltas, we can not reuse existing metadata, as
|
||||||
|
# that would stop deltas from being created.
|
||||||
|
# This seems to only affect createrepo_c though.
|
||||||
|
repo_dir_arch = None
|
||||||
|
|
||||||
comps_path = None
|
comps_path = None
|
||||||
if compose.has_comps and pkg_type == "rpm":
|
if compose.has_comps and pkg_type == "rpm":
|
||||||
|
@ -308,7 +308,7 @@ class TestCreateVariantRepo(PungiTestCase):
|
|||||||
database=True, groupfile=None, workers=3,
|
database=True, groupfile=None, workers=3,
|
||||||
outputdir=self.topdir + '/compose/Server/x86_64/os',
|
outputdir=self.topdir + '/compose/Server/x86_64/os',
|
||||||
pkglist=list_file, skip_stat=True, update=True,
|
pkglist=list_file, skip_stat=True, update=True,
|
||||||
update_md_path=self.topdir + '/work/x86_64/repo', deltas=True,
|
update_md_path=None, deltas=True,
|
||||||
oldpackagedirs=self.topdir + '/old/test-1.0-20151203.0/compose/Server/x86_64/os/Packages',
|
oldpackagedirs=self.topdir + '/old/test-1.0-20151203.0/compose/Server/x86_64/os/Packages',
|
||||||
use_xz=False)])
|
use_xz=False)])
|
||||||
self.assertItemsEqual(
|
self.assertItemsEqual(
|
||||||
@ -348,7 +348,7 @@ class TestCreateVariantRepo(PungiTestCase):
|
|||||||
database=True, groupfile=None, workers=3,
|
database=True, groupfile=None, workers=3,
|
||||||
outputdir=self.topdir + '/compose/Server/x86_64/os',
|
outputdir=self.topdir + '/compose/Server/x86_64/os',
|
||||||
pkglist=list_file, skip_stat=True, update=True,
|
pkglist=list_file, skip_stat=True, update=True,
|
||||||
update_md_path=self.topdir + '/work/x86_64/repo', deltas=True,
|
update_md_path=None, deltas=True,
|
||||||
oldpackagedirs=[
|
oldpackagedirs=[
|
||||||
self.topdir + '/old/test-1.0-20151203.0/compose/Server/x86_64/os/Packages/a',
|
self.topdir + '/old/test-1.0-20151203.0/compose/Server/x86_64/os/Packages/a',
|
||||||
self.topdir + '/old/test-1.0-20151203.0/compose/Server/x86_64/os/Packages/b',
|
self.topdir + '/old/test-1.0-20151203.0/compose/Server/x86_64/os/Packages/b',
|
||||||
@ -423,7 +423,7 @@ class TestCreateVariantRepo(PungiTestCase):
|
|||||||
database=True, groupfile=None, workers=3,
|
database=True, groupfile=None, workers=3,
|
||||||
outputdir=self.topdir + '/compose/Server/source/tree',
|
outputdir=self.topdir + '/compose/Server/source/tree',
|
||||||
pkglist=list_file, skip_stat=True, update=True,
|
pkglist=list_file, skip_stat=True, update=True,
|
||||||
update_md_path=self.topdir + '/work/global/repo', deltas=True,
|
update_md_path=None, deltas=True,
|
||||||
oldpackagedirs=self.topdir + '/old/test-1.0-20151203.0/compose/Server/source/tree/Packages',
|
oldpackagedirs=self.topdir + '/old/test-1.0-20151203.0/compose/Server/source/tree/Packages',
|
||||||
use_xz=False)])
|
use_xz=False)])
|
||||||
self.assertItemsEqual(
|
self.assertItemsEqual(
|
||||||
@ -460,7 +460,7 @@ class TestCreateVariantRepo(PungiTestCase):
|
|||||||
database=True, groupfile=None, workers=3,
|
database=True, groupfile=None, workers=3,
|
||||||
outputdir=self.topdir + '/compose/Server/x86_64/debug/tree',
|
outputdir=self.topdir + '/compose/Server/x86_64/debug/tree',
|
||||||
pkglist=list_file, skip_stat=True, update=True,
|
pkglist=list_file, skip_stat=True, update=True,
|
||||||
update_md_path=self.topdir + '/work/x86_64/repo', deltas=True,
|
update_md_path=None, deltas=True,
|
||||||
oldpackagedirs=self.topdir + '/old/test-1.0-20151203.0/compose/Server/x86_64/debug/tree/Packages',
|
oldpackagedirs=self.topdir + '/old/test-1.0-20151203.0/compose/Server/x86_64/debug/tree/Packages',
|
||||||
use_xz=False)])
|
use_xz=False)])
|
||||||
self.assertItemsEqual(
|
self.assertItemsEqual(
|
||||||
|
Loading…
Reference in New Issue
Block a user