Skip to content

Commit 96f8877

Browse files
nazunalikanazunalika
committed
dnf4 is required for reposync
1 parent 1470e59 commit 96f8877

11 files changed

+57
-9
lines changed

‎mangle/generators/generate_prepopulate_from_epr‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ else
99
exit 1
1010
fi
1111

12+
if [ -f /usr/bin/dnf4 ]; then
13+
SAFEDNF=/usr/bin/dnf4
14+
else
15+
SAFEDNF=/usr/bin/dnf
16+
fi
17+
1218
export RLVER=$MAJOR
1319
source common
1420

@@ -20,7 +26,7 @@ eln_repo_url="${ELN_KOJI_REPO}/${tag_template}/latest"
2026

2127
pushd "${tmpdir}" || { echo "Could not change directory"; exit 1; }
2228
for y in "${ARCH[@]}"; do
23-
repodatas=( $(dnf reposync --repofrompath ${tag_template},${eln_repo_url}/${y} --download-metadata --repoid=${tag_template} -p ${tag_template}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
29+
repodatas=( $($SAFEDNF reposync --repofrompath ${tag_template},${eln_repo_url}/${y} --download-metadata --repoid=${tag_template} -p ${tag_template}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
2430
mkdir -p "${tag_template}/${y}/repodata"
2531
pushd "${tag_template}/${y}/repodata" || { echo "Could not change directory"; exit 1; }
2632
for z in "${repodatas[@]}"; do

‎mangle/generators/generate_prepopulate_from_kpr‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ else
99
exit 1
1010
fi
1111

12+
if [ -f /usr/bin/dnf4 ]; then
13+
SAFEDNF=/usr/bin/dnf4
14+
else
15+
SAFEDNF=/usr/bin/dnf
16+
fi
17+
1218
export RLVER=$MAJOR
1319
source common
1420

@@ -20,7 +26,7 @@ stream_repo_url="${STREAM_KOJI_REPO}/${tag_template}/latest"
2026

2127
pushd "${tmpdir}" || { echo "Could not change directory"; exit 1; }
2228
for y in "${ARCH[@]}"; do
23-
repodatas=( $(dnf reposync --repofrompath ${tag_template},${stream_repo_url}/${y} --download-metadata --repoid=${tag_template} -p ${tag_template}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
29+
repodatas=( $($SAFEDNF reposync --repofrompath ${tag_template},${stream_repo_url}/${y} --download-metadata --repoid=${tag_template} -p ${tag_template}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
2430
mkdir -p "${tag_template}/${y}/repodata"
2531
pushd "${tag_template}/${y}/repodata" || { echo "Could not change directory"; exit 1; }
2632
for z in "${repodatas[@]}"; do

‎mangle/generators/generate_prepopulate_from_pungi‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ else
1010
exit 1
1111
fi
1212

13+
if [ -f /usr/bin/dnf4 ]; then
14+
SAFEDNF=/usr/bin/dnf4
15+
else
16+
SAFEDNF=/usr/bin/dnf
17+
fi
18+
1319
# Verify the date format
1420
echo "${DATE}" | grep -Eq '[0-9]+\.[0-9]'
1521
grep_val=$?

‎mangle/generators/generate_prepopulate_from_pungi_latest‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ else
99
exit 1
1010
fi
1111

12+
if [ -f /usr/bin/dnf4 ]; then
13+
SAFEDNF=/usr/bin/dnf4
14+
else
15+
SAFEDNF=/usr/bin/dnf
16+
fi
17+
1218
export RLVER=$MAJOR
1319
source common
1420

‎mangle/generators/generate_prepopulate_from_self_lh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ else
99
exit 1
1010
fi
1111

12+
if [ -f /usr/bin/dnf4 ]; then
13+
SAFEDNF=/usr/bin/dnf4
14+
else
15+
SAFEDNF=/usr/bin/dnf
16+
fi
17+
1218
export RLVER=$MAJOR
1319
source common
1420

@@ -21,7 +27,7 @@ stream_repo_url="https://kojidev.rockylinux.org/kojifiles/repos/${tag_template}/
2127

2228
pushd "${tmpdir}" || { echo "Could not change directory"; exit 1; }
2329
for y in x86_64 aarch64 i386; do
24-
repodatas=( $(dnf reposync --repofrompath ${str_template},${stream_repo_url}/${y} --download-metadata --repoid=${str_template} -p ${str_template}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
30+
repodatas=( $($SAFEDNF reposync --repofrompath ${str_template},${stream_repo_url}/${y} --download-metadata --repoid=${str_template} -p ${str_template}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
2531
mkdir -p "${str_template}/${y}/repodata"
2632
pushd "${str_template}/${y}/repodata" || { echo "Could not change directory"; exit 1; }
2733
for z in "${repodatas[@]}"; do

‎mangle/generators/generate_prepopulate_from_stream‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ else
1010
exit 1
1111
fi
1212

13+
if [ -f /usr/bin/dnf4 ]; then
14+
SAFEDNF=/usr/bin/dnf4
15+
else
16+
SAFEDNF=/usr/bin/dnf
17+
fi
18+
1319
# Verify the date format
1420
echo "${DATE}" | grep -Eq '[0-9]+\.[0-9]'
1521
grep_val=$?
@@ -31,7 +37,7 @@ pushd "${tmpdir}" || { echo "Could not change directory"; exit 1; }
3137
for x in "${REPO[@]}"; do
3238
echo "Working on ${x}"
3339
for y in "${ARCH[@]}"; do
34-
repodatas=( $(dnf reposync --repofrompath ${x},${stream_compose_url}/${x}/${y}/os --download-metadata --repoid=${x} -p ${x}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
40+
repodatas=( $($SAFEDNF reposync --repofrompath ${x},${stream_compose_url}/${x}/${y}/os --download-metadata --repoid=${x} -p ${x}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
3541
mkdir -p "${x}/${y}/repodata"
3642
pushd "${x}/${y}/repodata" || { echo "Could not change directory"; exit 1; }
3743
for z in "${repodatas[@]}"; do

‎mangle/generators/generate_prepopulate_from_stream_10‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ else
1010
exit 1
1111
fi
1212

13+
if [ -f /usr/bin/dnf4 ]; then
14+
SAFEDNF=/usr/bin/dnf4
15+
else
16+
SAFEDNF=/usr/bin/dnf
17+
fi
18+
1319
# Verify the date format
1420
echo "${DATE}" | grep -Eq '[0-9]+\.[0-9]'
1521
grep_val=$?
@@ -27,11 +33,17 @@ current=$(pwd)
2733
tmpdir=$(mktemp -d)
2834
stream_compose_url="https://composes.stream.centos.org/stream-${MAJOR}/production/CentOS-Stream-${MAJOR}-${DATE}/compose"
2935

36+
if [ -f /usr/bin/dnf4 ]; then
37+
SAFEDNF=/usr/bin/dnf4
38+
else
39+
SAFEDNF=/usr/bin/dnf
40+
fi
41+
3042
pushd "${tmpdir}" || { echo "Could not change directory"; exit 1; }
3143
for x in "${REPO[@]}"; do
3244
echo "Working on ${x}"
3345
for y in "${ARCH[@]}"; do
34-
repodatas=( $(dnf reposync --repofrompath ${x},${stream_compose_url}/${x}/${y}/os --download-metadata --repoid=${x} -p ${x}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
46+
repodatas=( $($SAFEDNF reposync --repofrompath ${x},${stream_compose_url}/${x}/${y}/os --download-metadata --repoid=${x} -p ${x}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
3547
mkdir -p "${x}/${y}/repodata"
3648
pushd "${x}/${y}/repodata" || { echo "Could not change directory"; exit 1; }
3749
for z in "${repodatas[@]}"; do

‎mangle/generators/generate_versions_from_kpr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ stream_repo_url="${STREAM_KOJI_REPO}/${tag_template}/latest"
2020

2121
pushd "${tmpdir}" || { echo "Could not change directory"; exit 1; }
2222
for y in "${ARCH[@]}"; do
23-
repodatas=( $(dnf reposync --repofrompath ${tag_template},${stream_repo_url}/${y} --download-metadata --repoid=${tag_template} -p ${tag_template}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
23+
repodatas=( $($SAFEDNF reposync --repofrompath ${tag_template},${stream_repo_url}/${y} --download-metadata --repoid=${tag_template} -p ${tag_template}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
2424
mkdir -p "${tag_template}/${y}/repodata"
2525
pushd "${tag_template}/${y}/repodata" || { echo "Could not change directory"; exit 1; }
2626
for z in "${repodatas[@]}"; do

‎mangle/generators/generate_versions_from_ppr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ peridot_repo_url="${PERIDOT_REPO}/${PERIDOT_PROJECT_ID}/repo/${tag_template}"
2424

2525
pushd "${tmpdir}" || { echo "Could not change directory"; exit 1; }
2626
for y in "${ARCH[@]}"; do
27-
repodatas=( $(dnf reposync --repofrompath ${tag_template},${peridot_repo_url}/${y} --download-metadata --repoid=${tag_template} -p ${tag_template}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
27+
repodatas=( $($SAFEDNF reposync --repofrompath ${tag_template},${peridot_repo_url}/${y} --download-metadata --repoid=${tag_template} -p ${tag_template}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
2828
mkdir -p "${tag_template}/${y}/repodata"
2929
pushd "${tag_template}/${y}/repodata" || { echo "Could not change directory"; exit 1; }
3030
for z in "${repodatas[@]}"; do

‎mangle/generators/generate_versions_from_stream‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pushd "${tmpdir}" || { echo "Could not change directory"; exit 1; }
3030
for x in "${REPO[@]}"; do
3131
echo "Working on ${x}"
3232
for y in "${ARCH[@]}"; do
33-
repodatas=( $(dnf reposync --repofrompath ${x},${stream_compose_url}/${x}/${y}/os --download-metadata --repoid=${x} -p ${x}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
33+
repodatas=( $($SAFEDNF reposync --repofrompath ${x},${stream_compose_url}/${x}/${y}/os --download-metadata --repoid=${x} -p ${x}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
3434
mkdir -p "${x}/${y}/repodata"
3535
pushd "${x}/${y}/repodata" || { echo "Could not change directory"; exit 1; }
3636
for z in "${repodatas[@]}"; do

0 commit comments

Comments
 (0)