Changeset 1129

Timestamp:

Dec 19, 2012, 7:02:47 PM (12 years ago)

Author:

joergs

Message:

better wildcsrd handling

File:

• obs/obs-service-dsc_filelist/usr/lib/obs/service/dsc_filelist (modified) (1 diff)

obs/obs-service-dsc_filelist/usr/lib/obs/service/dsc_filelist

@@ -110 +110 @@
 # update the file list in the description file
 for FILE_DSC in $FILES_DSC; do
-        [ -e $FILE_DSC ] || continue
+    [ -e $FILE_DSC ] || continue
     printf "$0: modifing file $FILE_DSC, adding "
-        grep -q "^Files:" $FILE_DSC || echo "Files: " >> $FILE_DSC
-        for filename in $FILES; do
-        path=`ls -1 "$filename" || ls -1 "_service:*:$filename"`
-        printf "${path##*:} "
-                printf ' %s %s %s\n' `md5 $path` `filesize $path` ${path##*:} >> $FILE_DSC
-        done
+    grep -q "^Files:" $FILE_DSC || echo "Files: " >> $FILE_DSC
+    for filename in $FILES; do
+        path=`ls -1 "$filename 2>/dev/null" || eval ls -1 "_service:*:$filename 2>/dev/null"`
+        [ -e $path ] || continue
+        printf "${path##*:} (${path})"
+        printf ' %s %s %s\n' `md5 $path` `filesize $path` ${path##*:} >> $FILE_DSC
+    done
     printf "\n"
 done
 
 exit 0
-
-