admin (AC-branch): ftp/geniso-poldek - new poldek has different sc...

arekm arekm at pld-linux.org
Mon Oct 3 22:13:31 CEST 2005


Author: arekm                        Date: Mon Oct  3 20:13:31 2005 GMT
Module: admin                         Tag: AC-branch
---- Log message:
- new poldek has different schema for split files - 01, 02 instead of 1, 2; support it

---- Files affected:
admin/ftp:
   geniso-poldek (1.15.2.12 -> 1.15.2.13) 

---- Diffs:

================================================================
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.12 admin/ftp/geniso-poldek:1.15.2.13
--- admin/ftp/geniso-poldek:1.15.2.12	Sun Oct  2 18:33:18 2005
+++ admin/ftp/geniso-poldek	Mon Oct  3 22:13:26 2005
@@ -58,6 +58,11 @@
 	DVD=""
 fi
 
+POLDEK_OLD=
+if ($POLDEK --version | grep -qE '0\.18\.'); then
+	POLDEK_OLD="yes"
+fi
+
 pld_info() {
 echo "
 ****************************************************************
@@ -124,7 +129,7 @@
 
     rm -rf ${ISOTMPDIR}/pld-${ARCH}*iso*
 
-#    if ($POLDEK --version | grep -qE '0\.18\.'); then
+#    if [ -n "$POLDEK_OLD" ]; then
 #	    $POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ --mkidxz
 #    else
 #	    $POLDEK -s ${ISODIR}/PLD/RPMS/ --mkidxz --mkidx-type pndir
@@ -176,7 +181,11 @@
 	
 	mkdir -p ${ISODIR}/PLD/RPMS
 #	ln -s .						${ISODIR}/PLD/RPMS/RPMS
-	for file in $(cat ${ISOTMPDIR}/pld-${ARCH}.iso.list.$((${NR} - 1))); do
+
+	FSUFFIX="$((${NR} - 1))"
+	[ -z "$POLDEK_OLD" ] && FSUFFIX="$(printf "%02d" "$FSUFFIX")"
+	
+	for file in $(cat ${ISOTMPDIR}/pld-${ARCH}.iso.list.${FSUFFIX}); do
 		ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/${file} \
 			${ISODIR}/PLD/RPMS/${file}
 	done
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.12&r2=1.15.2.13&f=u




More information about the pld-cvs-commit mailing list