--- builds_bin/build_ISO	2009/06/22 16:46:16	1.28
+++ builds_bin/build_ISO	2011/06/14 18:20:44	1.35
@@ -53,7 +53,7 @@ then
 	$(pwd)/$distarch/
 fi
 
-rm -f ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso ../iso/$distrel/$distarch/$disttag.iso
+rm -f ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso* ../iso/$distrel/$distarch/$disttag-$distarch.iso
 rm -f ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.jigdo ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.template
 
 if [ "$distrel" == "7" ]
@@ -62,7 +62,7 @@ then
 else
     createrepo --update --database --groupfile repodata/comps.xml -u "media://$(head -1 $distarch/.discinfo)" $(pwd)/$distarch/
 fi
-sync; rm -rf $(pwd)/$distarch/.olddata
+sync; rm -rf $(pwd)/$distarch/.olddata $(pwd)/$distarch/repodata/repoview $(pwd)/$distarch/repoview
 repoview $(pwd)/$distarch/
 sync; rm -rf $(pwd)/$distarch/.repodata
 
@@ -85,8 +85,8 @@ dd if=/dev/zero bs=2048 count=150 >> ../
 md5sum ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso | sed 's,\.\..*/,,' > ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.md5sum
 sha1sum ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso | sed 's,\.\..*/,,' > ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.sha1sum
 zsyncmake -u $disttag-$distvers-$distarch.iso -o ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.zsync ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
-mv ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso ../iso/$distrel/$distarch/$disttag.iso
-ln -sf $disttag.iso ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
+mv ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso ../iso/$distrel/$distarch/$disttag-$distarch.iso
+ln -sf $disttag-$distarch.iso ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
 
 rsync -a --delete --delete-excluded \
     --exclude 'repodata/' --exclude 'product/' --exclude 'updates/' --exclude 'repoview/' \
@@ -103,7 +103,7 @@ rm -rf $distarch.jigdo/
 
 if [ -d SRPMS -a "$distarch" == "i386" ]
 then
-    rm -f ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso ../iso/$distrel/source/$disttag-SRPMS.iso
+    rm -f ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso* ../iso/$distrel/source/$disttag-SRPMS.iso*
 
     mkisofs $mkisopts \
 	-V "$distname $distvers SRPMS" \