Changeset 20590e3


Ignore:
Timestamp:
10/29/13 13:21:58 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
193c44c, 71d919d
Parents:
1234f7c (diff), 40e8efb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
2 edited

Legend:

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

    rf233898 r40e8efb  
    75367536        pkg info -e ${_lPortRaw} 
    75377537        if [ $? -ne 0 ] ; then exit_err "Failed to install $_lPortRaw" ; fi 
     7538 
     7539        # Save any users / groups we need to create later 
     7540        local pUsers="`pkg query "%U" $_lPortRaw`" 
     7541        local pGroups="`pkg query "%G" $_lPortRaw`" 
     7542        if [ -n "$pUsers" ] ; then 
     7543                PBI_BUILD_USERS="$PBI_BUILD_USERS $pUsers" 
     7544        fi 
     7545        if [ -n "$pGroups" ] ; then 
     7546                PBI_BUILD_GROUPS="$PBI_BUILD_GROUPS $pGroups" 
     7547        fi 
     7548 
    75387549        return 0 
    75397550  fi 
    75407551 
    75417552  # Lets do old-fashioned build 
    7542  
    7543   # KPM! ##############  
    7544   # We will need to revisit this portion later, see if we can 
    7545   # grab the user / group list from pkgng installed packages 
    75467553 
    75477554  # Save any users / groups we need to create later 
  • src-qt4/PCDM/src/main.cpp

    r9cc1b3c r1234f7c  
    3232//#endif 
    3333 
    34 bool USECLIBS=true; 
     34bool USECLIBS=false; 
    3535 
    3636int runSingleSession(int argc, char *argv[]){ 
Note: See TracChangeset for help on using the changeset viewer.