Merge branch 'uuidfiles' into 'master'

Remove uuid files with certificates

See merge request !227

reposync/runreposync.sh

@@ -172,7 +172,7 @@ EOF
     if [ -f "$MODULEFILE" ]; then
       /usr/bin/modifyrepo --mdtype=modules $MODULEFILE $REPOPATH/repodata
       NEWMODULEFILE=$(sed '/yaml.gz/!d; s/.*repodata\/\(.*\)".*/\1/' ${REPOPATH}/repodata/repomd.xml)
-      /usr/bin/find ${REPOPATH} -name '*module*.yaml*' -not -name $NEWMODULEFILE -printf "removed '%f'\n" -delete
+      /usr/bin/find ${REPOPATH} -name '*module*.yaml*' -not -path ${REPOPATH}/repodata/$NEWMODULEFILE -printf "removed '%f'\n" -delete
 
     fi
   fi # end of if [[ $RUN_CREATEREPO -eq 1 ]]
@@ -221,6 +221,10 @@ cat << EOF | log > $OUTPUT
   "changes": [${LIST}]
 EOF
 
+# Remove uuid files with certificates
+echo /usr/bin/find ${REPOPATH} -regextype posix-extended -regex '^.*/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}' -not -name '*.rpm' -printf "removed '%f'\n" -delete
+/usr/bin/find ${REPOPATH} -regextype posix-extended -regex '^.*/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}' -not -name '*.rpm' -printf "removed '%f'\n" -delete
+
 # Clean up after yourself, and release your trap
 rm -f "$LOCKFILE"
 trap - INT TERM EXIT