admin (AC-branch): ftp/geniso-mini - use -publisher instead of dep...

glen glen at pld-linux.org
Mon May 15 20:17:58 CEST 2006


Author: glen                         Date: Mon May 15 18:17:58 2006 GMT
Module: admin                         Tag: AC-branch
---- Log message:
- use -publisher instead of deprecated -P mkisofs option
- catch errors from poldek list generation
- make target dir for iso if missing

---- Files affected:
admin/ftp:
   geniso-mini (1.20.2.4 -> 1.20.2.5) 

---- Diffs:

================================================================
Index: admin/ftp/geniso-mini
diff -u admin/ftp/geniso-mini:1.20.2.4 admin/ftp/geniso-mini:1.20.2.5
--- admin/ftp/geniso-mini:1.20.2.4	Wed Mar 22 18:18:54 2006
+++ admin/ftp/geniso-mini	Mon May 15 20:17:53 2006
@@ -92,8 +92,13 @@
 
     add_pkgs=""
 
-    pkgs=`$POLDEK -V -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ \
-    	--pset mini-iso.lst $add_pkgs $arch_pkgs | \
+    buf=`$POLDEK -V -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ \
+    	--pset mini-iso.lst $add_pkgs $arch_pkgs` || {
+		echo >&2 "$buf"
+		exit 1
+	}
+
+    pkgs=`echo "$buf" | \
     	egrep '(^mark | marks )' | sed -e 's/^mark //; s/.* marks //; s/(cap .*)//' | xargs`
 
     set +x
@@ -120,7 +125,7 @@
 #    rm -rf $T/PLD/inst/pkg/*experimental
 
     common_iso_opt="-J -R -r -V MINI-ISO -A PLD-Linux \
-    	-P '<feedback at pld-linux.org>' \
+    	-publisher '<feedback at pld-linux.org>' \
     	-abstract PLD-README.txt ${MKISOFSOPT}"
 
     case $ARCH in
@@ -128,6 +133,7 @@
         cp $R/images/*.img $T/PLD/images
 	BOOTOPT="-b ${BOOTDISK} -c PLD/images/boot.cat"
         echo "Running mkisofs for ${ISONAME}.iso"
+	mkdir -p ${ISOTARGET}/iso/${DIST}/${ARCH}
 	${MKISOFS} \
 	  ${common_iso_opt} \
 	  -sysid ia32 \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/admin/ftp/geniso-mini?r1=1.20.2.4&r2=1.20.2.5&f=u



More information about the pld-cvs-commit mailing list