diff options
| author | Bryan Drewery <bryan@shatow.net> | 2014-04-19 04:05:09 +0400 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2014-04-19 04:05:09 +0400 |
| commit | 754dc09027d12751d986846ddcc2f18a21d2d088 (patch) | |
| tree | b02a294fe6492d3ab2611701ec41b317cb7c68ba | |
| parent | df914777d824fd6fe21c077e7a61556d8beb601b (diff) | |
leftovers: Only need plistsub_sed for legacy checking
MFH
| -rwxr-xr-x | src/share/poudriere/common.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index ad3c4d2f..30024dad 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -1428,7 +1428,7 @@ _real_build_port() { local pkgenv phaseenv local no_stage=$(injail make -C ${portdir} -VNO_STAGE) local targets install_order - local stagedir plistsub_sed + local stagedir local jailuser local testfailure=0 local max_execution_time @@ -1542,7 +1542,6 @@ _real_build_port() { fi if [ "${phase}" = "deinstall" ]; then - plistsub_sed=$(injail env ${PORT_FLAGS} make -C ${portdir} -V'PLIST_SUB:C/"//g:NLIB32*:NPERL_*:NPREFIX*:N*="":N*="@comment*:C/(.*)=(.*)/-es!\2!%%\1%%!g/') PREFIX=$(injail env ${PORT_FLAGS} make -C ${portdir} -VPREFIX) if [ -z "${no_stage}" ]; then bset ${MY_JOBID} status "stage_orphans:${port}" @@ -1655,7 +1654,8 @@ Try testport with -n to use PREFIX=LOCALBASE" done else # LEGACY - Support for older ports tree. - local users user homedirs + local users user homedirs plistsub_sed + plistsub_sed=$(injail env ${PORT_FLAGS} make -C ${portdir} -V'PLIST_SUB:C/"//g:NLIB32*:NPERL_*:NPREFIX*:N*="":N*="@comment*:C/(.*)=(.*)/-es!\2!%%\1%%!g/') users=$(injail make -C ${portdir} -VUSERS) homedirs="" |