Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't automatically compress metadata files via modifyrepo_c #248

Closed
wants to merge 1 commit into from
Closed

Don't automatically compress metadata files via modifyrepo_c #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,19 +543,19 @@ 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
rm $@/kangaroo-0.3-1.noarch.rpm
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
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions rpm/gen-fixtures.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion rpm/gen-patched-fixtures.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading