Changeset b1511eb


Ignore:
Timestamp:
Sep 17, 2013 12:32:41 PM (7 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
52c32d9
Parents:
04144d6
Message:

Fix a few bugs relating to pulling pkgs from PKGNG

File:
1 edited

Legend:

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

    r6808980 rb1511eb  
    49294929start_pbi_makeport() 
    49304930{ 
    4931         do_port_build "/usr/ports/${PBI_MAKEPORT}" 
     4931        do_port_build "${PBI_MAKEPORT}" 
    49324932} 
    49334933 
     
    49394939        local iFile="$PORTSDIR/INDEX-$FBSDMAJOR" 
    49404940 
    4941         get_pkgname "${PORTSDIR}/${PBI_MAKEPORT}" 
     4941        get_pkgname "${PBI_MAKEPORT}" 
    49424942        echo "${PKGNAME}" > /.keepports 
    49434943        grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports 
     
    49474947        do 
    49484948                if [ ! -d "${PORTSDIR}/${port}" ] ; then continue ; fi 
    4949                 get_pkgname "${PORTSDIR}/${port}" 
     4949                get_pkgname "${port}" 
    49504950                echo "${PKGNAME}" >> /.keepports 
    49514951                grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports 
     
    49554955        do 
    49564956                if [ ! -d "${PORTSDIR}/${port}" ] ; then continue ; fi 
    4957                 get_pkgname "${PORTSDIR}/${port}" 
     4957                get_pkgname "${port}" 
    49584958                echo "${PKGNAME}" >> /.keepports 
    49594959                grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports 
     
    49804980# Get the full package-name for a target port 
    49814981get_pkgname() { 
    4982         name="`make -C ${1} -V PKGNAME PORTSDIR=${PORTSDIR}`" 
     4982        name="`pkg info -O ${1} | awk '{print $1}'`" 
    49834983        PKGNAME="${name}" 
    49844984} 
     
    49944994                        exit_err "/usr/ports/${port} does not exist!" 
    49954995                fi 
    4996                 do_port_build "/usr/ports/${port}" 
     4996                do_port_build "${port}" 
    49974997        done 
    49984998 
     
    50095009                        exit_err "/usr/ports/${port} does not exist!" 
    50105010                fi 
    5011                 do_port_build "/usr/ports/${port}" 
     5011                do_port_build "${port}" 
    50125012        done 
    50135013 
     
    71927192mk_auto_ext_linksfile() { 
    71937193        # Get ports name 
    7194         get_pkgname "${PORTSDIR}/${PBI_MAKEPORT}" 
     7194        get_pkgname "${PBI_MAKEPORT}" 
    71957195        _pname="${PKGNAME}" 
    71967196 
    7197         # Define some commands 
    7198         pkgInf="pkg info -l" 
    7199  
    7200         ${pkgInf} ${_pname} | sed "s|^${PBI_PROGDIRPATH}/||g" \ 
     7197        pkg info -l ${_pname} | sed "s|^${PBI_PROGDIRPATH}/||g" \ 
    72017198                | grep -v -e "^Information for" -e "^Files:" -e "owns the following" \ 
    72027199                | tr -s '\t' ' ' \ 
     
    73217318do_port_build() 
    73227319{ 
    7323   local _lPort="$1" 
     7320  local _lPortRaw="$1" 
     7321  local _lPort="/usr/ports/$1" 
    73247322 
    73257323  local iFile="$PORTSDIR/INDEX-$FBSDMAJOR" 
     
    73637361  # Are we doing a PKGNG build? 
    73647362  if [ "$PBI_PKGNGBUILD" ] ; then 
    7365         pkg install -y "$_lPort"         
     7363        pkg install -y "$_lPortRaw" 
    73667364        if [ $? -ne 0 ] ; then 
    7367            exit_err "Failed installing $_lPort" 
     7365           exit_err "Failed installing $_lPortRaw" 
    73687366        fi 
    73697367        return 0 
Note: See TracChangeset for help on using the changeset viewer.