majors have more than one character now, fix it

Author: nazunalika

sync/common

@@ -260,15 +260,15 @@ function createrepo_only() {
   local TARGET="${1}"
   local TARGET_REV="${2}"
   createrepo "${TARGET}" \
-    "--distro=cpe:/o:rocky:rocky:${TARGET_REV:0:1},Rocky Linux ${TARGET_REV:0:1}" \
+    "--distro=cpe:/o:rocky:rocky:${TARGET_REV},Rocky Linux ${TARGET_REV}" \
     --workers 12
 }
 
 function createrepo_update() {
   local TARGET="${1}"
   local TARGET_REV="${2}"
   createrepo --update "${TARGET}" \
-    "--distro=cpe:/o:rocky:rocky:${TARGET_REV:0:1},Rocky Linux ${TARGET_REV:0:1}" \
+    "--distro=cpe:/o:rocky:rocky:${TARGET_REV},Rocky Linux ${TARGET_REV}" \
     --workers 12
 }
 
@@ -279,7 +279,7 @@ function createrepo_comps() {
   createrepo --update "${TARGET}" \
     --groupfile="${TARGET_COMPS}" \
     --xz --revision="${TARGET_REV}" \
-    "--distro=cpe:/o:rocky:rocky:${TARGET_REV:0:1},Rocky Linux ${TARGET_REV:0:1}" \
+    "--distro=cpe:/o:rocky:rocky:${TARGET_REV},Rocky Linux ${TARGET_REV}" \
     --workers 12 --checksum=sha256
 }
 
@@ -313,7 +313,7 @@ function createrepo_updates() {
   local TARGET="${1}"
   local TARGET_REV="${2}"
   createrepo "${TARGET}" \
-    "--distro=cpe:/o:rocky:rocky:${TARGET_REV:0:1},Rocky Linux ${TARGET_REV:0:1}" \
+    "--distro=cpe:/o:rocky:rocky:${TARGET_REV},Rocky Linux ${TARGET_REV}" \
     --workers 12 --update
 }
 

sync/sync-to-staging.sh

@@ -57,7 +57,7 @@ if [ $ret_val -eq "0" ]; then
     test -d "${TARGET}/${src_repo}"
     ret_val=$?
     if [ $ret_val -eq "0" ]; then
-      createrepo_update "${TARGET}/${src_repo}" "${REVISION}"
+      createrepo_update "${TARGET}/${src_repo}" "${MAJOR}"
       fix_metadata "${TARGET}/${src_repo}/repodata/repomd.xml"
       sign_data "${TARGET}/${src_repo}/repodata/repomd.xml" "${RLVER}"
     else
@@ -75,7 +75,7 @@ if [ $ret_val -eq "0" ]; then
       test -d "${TARGET}/${debug_repo}"
       ret_val=$?
       if [ $ret_val -eq "0" ]; then
-        createrepo_update "${TARGET}/${debug_repo}" "${REVISION}"
+        createrepo_update "${TARGET}/${debug_repo}" "${MAJOR}"
         fix_metadata "${TARGET}/${debug_repo}/repodata/repomd.xml"
         sign_data "${TARGET}/${debug_repo}/repodata/repomd.xml" "${RLVER}"
       else
@@ -92,7 +92,7 @@ if [ $ret_val -eq "0" ]; then
         test -d "${REPO_PATH}"
         ret_val=$?
         if [ $ret_val -eq "0" ]; then
-          createrepo_comps "${REPO_PATH}" "${REVISION}" "${COMP_PATH}"
+          createrepo_comps "${REPO_PATH}" "${MAJOR}" "${COMP_PATH}"
           fix_metadata "${REPO_PATH}/repodata/repomd.xml"
           sign_data "${REPO_PATH}/repodata/repomd.xml" "${RLVER}"
         else
@@ -132,7 +132,7 @@ if [ $ret_val -eq "0" ]; then
       test -d "${TARGET}/${arch_repo}"
       ret_val=$?
       if [ $ret_val -eq "0" ]; then
-        createrepo_update "${TARGET}/${arch_repo}" "${REVISION}"
+        createrepo_update "${TARGET}/${arch_repo}" "${MAJOR}"
         fix_metadata "${TARGET}/${arch_repo}/repodata/repomd.xml"
         sign_data "${TARGET}/${arch_repo}/repodata/repomd.xml" "${RLVER}"
       else

sync/vault-release-no-repodata.sh

@@ -38,16 +38,16 @@ if [ "$RLVER" -eq "9" ]; then
   # groups
   for repo in "${MODS_REPOS[@]}"; do
     for arch in "${ARCHES[@]}"; do
-      createrepo_comps "${TARGET}/${repo}/${arch}/os" "${REV}" "${PRODUCTION_ROOT}/${CATEGORY_STUB}/${REV}/${repo}/${arch}/os/repodata/"*GROUPS.xml
+      createrepo_comps "${TARGET}/${repo}/${arch}/os" "${MAJOR}" "${PRODUCTION_ROOT}/${CATEGORY_STUB}/${REV}/${repo}/${arch}/os/repodata/"*GROUPS.xml
     done
   done
   # no groups
   for repo in "${NONMODS_REPOS[@]}"; do
     for arch in "${ARCHES[@]}"; do
-      createrepo_update "${TARGET}/${repo}/${arch}/os" "${REV}"
-      createrepo_update "${TARGET}/${repo}/${arch}/debug/tree" "${REV}"
+      createrepo_update "${TARGET}/${repo}/${arch}/os" "${MAJOR}"
+      createrepo_update "${TARGET}/${repo}/${arch}/debug/tree" "${MAJOR}"
     done
-      createrepo_update "${TARGET}/${repo}/source/tree" "${REV}"
+      createrepo_update "${TARGET}/${repo}/source/tree" "${MAJOR}"
   done
 fi