[Erp5-report] r8740 - in /umigumi/trunk: umibuilder.py umibuilder_pxe

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Jul 25 15:11:14 2006
New Revision: 8740

URL: http://svn.erp5.org?rev=8740&view=rev
Log:

stop the dls_cd generation if tc image generation fails


Modified:
    umigumi/trunk/umibuilder.py   (contents, props changed)
    umigumi/trunk/umibuilder_pxe

Modified: umigumi/trunk/umibuilder.py
URL: http://svn.erp5.org/umigumi/trunk/umibuilder.py?rev=8740&r1=8739&r2=8740&view=diff
==============================================================================
--- umigumi/trunk/umibuilder.py (original)
+++ umigumi/trunk/umibuilder.py Tue Jul 25 15:11:14 2006
@@ -216,6 +216,7 @@
     # XXX: Big hack by kev: some post scripts failed in Mandriva 2006 kernel, so ignore errors if they came when installing kernels.
     if status != 0 and "/kernel-" not in command:
       raise RuntimeError, 'Failed in executing %s' % command
+  return status
 
 def buildAll(config, dry_run = 0):
   '''
@@ -965,7 +966,11 @@
   if target[:3] == "dls" :
     # generation of tc pxe image
     if 'a' in stage_list or 'p' in stage_list:
-      os.system('./umibuilder_pxe')
+      print "Generating a thin client image"
+      status = executeCommand('./umibuilder_pxe')
+      if status != 0:
+        raise RuntimeError("Generating thin client failed, check its output")
+
   config = target_map[target]
 
   # Set some default values if necessary.

Propchange: umigumi/trunk/umibuilder.py
------------------------------------------------------------------------------
    (empty)

Modified: umigumi/trunk/umibuilder_pxe
URL: http://svn.erp5.org/umigumi/trunk/umibuilder_pxe?rev=8740&r1=8739&r2=8740&view=diff
==============================================================================
--- umigumi/trunk/umibuilder_pxe (original)
+++ umigumi/trunk/umibuilder_pxe Tue Jul 25 15:11:14 2006
@@ -9,11 +9,11 @@
 # creates the pxe thinclient image (new target tc_pxe)
 echo -e "Generating tc pxe image...\n"
 
-./umibuilder -w ebox -bprcb tc_pxe
+./umibuilder -w ebox -bprcb tc_pxe || exit 1
 
 # gets the useful part of the tc image
-cp -f ./mdk-tc_pxe/base.sqh custom/dls_cd/var/tc_nfsroot/tc.sqfs
-cp -f ./mdk-tc_pxe/initrd.img custom/dls_cd/var/lib/tftpboot/pxeboot.img.gz
-cp -f ./mdk-tc_pxe/boot/vmlinuz-* custom/dls_cd/var/lib/tftpboot/vmlinuz_tc
+cp -f ./mdk-tc_pxe/base.sqh custom/dls_cd/var/tc_nfsroot/tc.sqfs || exit 1
+cp -f ./mdk-tc_pxe/initrd.img custom/dls_cd/var/lib/tftpboot/pxeboot.img.gz || exit 1
+cp -f ./mdk-tc_pxe/boot/vmlinuz-* custom/dls_cd/var/lib/tftpboot/vmlinuz_tc || exit 1
 
 exit 0