From b444fa7a93141dbca20f70ef069a783dc57109ef Mon Sep 17 00:00:00 2001
From: ramon <ramongomez@us.es>
Date: Tue, 10 Oct 2017 16:18:05 +0000
Subject: #810: Corregir errata al tratar información de imágenes en
 subdirectorios.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://opengnsys.es/svn/branches/version1.1@5453 a21b9725-9963-47de-94b9-378ad31fedc9
---
 repoman/bin/checkrepo | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'repoman/bin')

diff --git a/repoman/bin/checkrepo b/repoman/bin/checkrepo
index b0ac1922..c2628ba7 100755
--- a/repoman/bin/checkrepo
+++ b/repoman/bin/checkrepo
@@ -195,18 +195,19 @@ function checkremoved() {
     m=$(jq ".ous | length" $INFOFILE)
     for ((j=0; j<m; j++)); do
         # OU subdir.
-        OU="$(jq -r ".ous[$i].subdir" $INFOFILE)"
+        OU="$(jq -r ".ous[$j].subdir" $INFOFILE)"
         # Delete OU's entries if its subdir does not exist.
         if [ ! -e "$IMAGESDIR/$OU" ]; then
-            jq "del(.ous[[$j])" $INFOFILE | sponge $INFOFILE
+            jq "del(.ous[$j])" $INFOFILE | sponge $INFOFILE
         else
             n=$(jq ".images | length" $INFOFILE)
             for ((i=0; i<n; i++)); do
                 # Image name and type.
-                IMG="$(jq -r ".images[$i].name" $INFOFILE)"
-                TYPE="$(jq -r ".images[$i].type" $INFOFILE)"
+                IMG="$(jq -r ".ous[$j].images[$i].name" $INFOFILE)"
+                TYPE="$(jq -r ".ous[$j].images[$i].type" $INFOFILE)"
+                [ "$TYPE" != "dir" ] && IMG="$IMG.$TYPE"
                 # Delete entry if image does not exist and it's not locked.
-                [ ! -e "$IMAGESDIR/$OU/$IMG" -a ! -e "$IMAGESDIR/$OU/$IMG.lock" ] && jq "del(.ous[[$j].images[$i])" $INFOFILE | sponge $INFOFILE
+                [ ! -e "$IMAGESDIR/$OU/$IMG" -a ! -e "$IMAGESDIR/$OU/$IMG.lock" ] && jq "del(.ous[$j].images[$i])" $INFOFILE | sponge $INFOFILE
             done
         fi
     done
-- 
cgit v1.2.3-18-g5258