Ignore:
Timestamp:
07/05/13 13:33:50 (13 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
6810bbb
Parents:
635dc54
Message:

Add fallback check to i386 on pbi_add -r <app>

File:
1 edited

Legend:

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

    r9788f38 r8534088  
    53495349        if [ -n "$PBI_ADD_ALTVER" ] ; then _rVer=$PBI_ADD_ALTVER ; fi 
    53505350 
    5351  
    53525351        check_pbi_update "$_rtar" "nodisplay" \ 
    53535352         "$_rtar" "$_rVer" \ 
    53545353         "$FBSDMAJOR" "$_rArch" "${PBI_ADDREPO_ID}" 
    53555354        if [ "$?" != "0" ] ; then  
    5356                 exit_err "Could not find \"$_rtar\" in any indexes"  
     5355                # If we are on amd64, do a fallback check to i386 for this PBI 
     5356                # This catches apps like wine / skype and others 
     5357                if [ "$_rArch" = "amd64" ] ; then 
     5358                        _rArch="i386" 
     5359                        check_pbi_update "$_rtar" "nodisplay" \ 
     5360                        "$_rtar" "$_rVer" \ 
     5361                        "$FBSDMAJOR" "$_rArch" "${PBI_ADDREPO_ID}" 
     5362                        if [ "$?" != "0" ] ; then  
     5363                                exit_err "Could not find \"$_rtar\" in any indexes"  
     5364                        fi 
     5365                else 
     5366                        exit_err "Could not find \"$_rtar\" in any indexes"  
     5367                fi 
    53575368        fi 
    53585369 
Note: See TracChangeset for help on using the changeset viewer.