From d44267bbb75e4dbcc721475fa6d13113b3d23b22 Mon Sep 17 00:00:00 2001 From: Daniel Alley Date: Mon, 20 Nov 2023 22:51:10 -0500 Subject: [PATCH] Don't automatically compress metadata files via modifyrepo_c [noissue] --- Makefile | 8 ++++---- rpm/gen-fixtures.sh | 4 ++-- rpm/gen-patched-fixtures.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 00fc396..a59cd71 100644 --- a/Makefile +++ b/Makefile @@ -543,11 +543,11 @@ fixtures/rpm-with-sha: fixtures fixtures/rpm-modular: fixtures rpm/gen-fixtures.sh $@ rpm/assets-modularity - modifyrepo_c --mdtype=modules rpm/assets-modularity/modules.yaml "$@/repodata/" + modifyrepo_c --no-compress --mdtype=modules rpm/assets-modularity/modules.yaml "$@/repodata/" fixtures/rpm-with-modules: fixtures rpm/gen-patched-fixtures.sh -d $@ -f rpm/modules-updateinfo.patch - modifyrepo_c --mdtype=modules rpm/assets/modules.yaml "$@/repodata/" + modifyrepo_c --no-compress --mdtype=modules rpm/assets/modules.yaml "$@/repodata/" fixtures/rpm-with-modules-modified: fixtures rpm/gen-patched-fixtures.sh -d $@ -f rpm/modules-updateinfo.patch @@ -555,7 +555,7 @@ fixtures/rpm-with-modules-modified: fixtures rm $@/shark-0.1-1.noarch.rpm rm $@/stork-0.12-2.noarch.rpm createrepo_c --general-compress-type gz --update $@ - modifyrepo_c --mdtype=modules rpm/assets/modules.yaml "$@/repodata/" + modifyrepo_c --no-compress --mdtype=modules rpm/assets/modules.yaml "$@/repodata/" fixtures/rpm-modules-static-context: fixtures rpm/gen-patched-fixtures.sh -d $@ -f rpm/modules-static-context.patch -t module -a rpm/assets-modularity @@ -573,7 +573,7 @@ fixtures/rpm-with-sha-512: fixtures fixtures/rpm-with-sha-1-modular: fixtures rpm/gen-patched-fixtures.sh -d $@ -f rpm/modules-updateinfo.patch -s sha1 - modifyrepo_c --mdtype=modules rpm/assets/modules.yaml "$@/repodata/" + modifyrepo_c --no-compress --mdtype=modules rpm/assets/modules.yaml "$@/repodata/" fixtures/rpm-with-vendor: fixtures rpm/gen-rpm-and-repo.sh $@ "rpm/assets-specs/$$(basename $@).spec" diff --git a/rpm/gen-fixtures.sh b/rpm/gen-fixtures.sh index 7c5e4fb..5dcb5d6 100755 --- a/rpm/gen-fixtures.sh +++ b/rpm/gen-fixtures.sh @@ -103,14 +103,14 @@ else fi if test -f "${assets_dir}/updateinfo.xml"; then - modifyrepo_c --mdtype updateinfo \ + modifyrepo_c --no-compress --mdtype updateinfo \ --checksum "${checksum_type:-${checksum_type_default}}" \ "${assets_dir}/updateinfo.xml" \ "${working_dir}/repodata/" fi if [[ "${productid}" && -f "${assets_dir}/productid" ]]; then - modifyrepo_c --mdtype productid --simple-md-filenames \ + modifyrepo_c --no-compress --mdtype productid --simple-md-filenames \ --checksum "${checksum_type:-${checksum_type_default}}" \ "${assets_dir}/productid" \ "${working_dir}/repodata/" diff --git a/rpm/gen-patched-fixtures.sh b/rpm/gen-patched-fixtures.sh index 153463e..cf24c82 100755 --- a/rpm/gen-patched-fixtures.sh +++ b/rpm/gen-patched-fixtures.sh @@ -74,5 +74,5 @@ patch "${assets_dir}/${destfile}" "${patchfile}" ./rpm/gen-fixtures.sh --checksum-type "${checksum_info}" "${output_dir}" "${assets_dir}" if [[ $patchtype == "module" ]] then - modifyrepo_c --mdtype modules "${assets_dir}/${destfile}" "${output_dir}/repodata" + modifyrepo_c --no-compress --mdtype modules "${assets_dir}/${destfile}" "${output_dir}/repodata" fi