Changeset b2a8744


Ignore:
Timestamp:
Sep 29, 2013 12:51:21 PM (7 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
0a6de4c
Parents:
48f81fc
Message:

Don't remove the header-dir, since it gets bundled into the PBI now

Speed up the cleanup as well, don't need to do a rm -rf on STAGEDIR,
let the parent process do the cleanup as apart of the chroot. Also
more often than not it will be a ZFS dataset which we can more quickly
just destroy.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager10/pbi-manager

    r48f81fc rb2a8744  
    35283528        mk_header_file 
    35293529 
    3530         # Remove the new headerdir 
    3531         rm -rf "$PBI_HEADERDIR" 
    3532          
    35333530        # Now finish up and make the resulting PBI file 
    35343531        mk_output_pbi 
     
    35813578        save_pbi_details_to_header 
    35823579        mk_header_file 
    3583         rm_header_dir 
    35843580 
    35853581        mk_output_pbi 
     
    40594055} 
    40604056 
    4061 # Remove the tmp header-dir 
    4062 rm_header_dir() { 
    4063         PBI_HEADERDIR="${PBI_PROGDIRPATH}/.headerdir" 
    4064         if [ -e "${PBI_HEADERDIR}" ] ; then rm -rf "${PBI_HEADERDIR}" ; fi 
    4065 } 
    4066  
    40674057# Create a dir for staging the final archive 
    40684058mk_stage_dir() { 
     
    41214111# Remove the stagedir 
    41224112rm_stage_dir() { 
     4113        # If this is in the chroot we can exit and let the parent cleanup 
     4114        if [ "$0" = "pbi_makeport_chroot" ] ; then return; fi 
     4115 
    41234116        cd / 
    41244117        PBI_STAGEDIR="${PBI_PROGDIRPATH}/.stagedir" 
Note: See TracChangeset for help on using the changeset viewer.