Changeset ca2031d


Ignore:
Timestamp:
01/31/14 11:20:29 (7 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2
Children:
e8525e3, 07282ae
Parents:
bfa665a (diff), c494b93 (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-manager/pbime/pbimount

    r6542c9a rc494b93  
    9797   is_mounted "${pDir}/virtbase/usr/local" || ($NULLFS ${1}/local "${pDir}/virtbase/usr/local" ; $MNTSLEEP ) 
    9898   is_mounted "${pDir}/virtbase/var/run" || ($NULLFS ${pDir}/run "${pDir}/virtbase/var/run" ; $MNTSLEEP ) 
     99   if [ -d "/var/run/dbus" ] ; then 
     100     is_mounted "${pDir}/virtbase/var/run/dbus" || ( mkdir ${pDir}/virtbase/var/run/dbus 2>/dev/null ; $NULLFS /var/run/dbus "${pDir}/virtbase/var/run/dbus" ; $MNTSLEEP ) 
     101   fi 
    99102   is_mounted "${pDir}/virtbase/compat/linux" || ($NULLFS ${1}/linux "${pDir}/virtbase/compat/linux" ; $MNTSLEEP ) 
    100103 
  • src-qt4/EasyPBI/PBIModule.cpp

    r87e73145 rbfa665a  
    130130        if(val.endsWith("\"")){ val.chop(1); } //remove the ending quote 
    131131      //qDebug() << "var="+var+"\t\tval="+val; 
     132      //Make sure the MKPORTAFTER list is split up 
     133      if( (var=="PBI_MKPORTAFTER" || var=="PBI_MKPORTBEFORE") && !val.isEmpty()){ val = val.replace("\n"," ").simplified().split(" ").join("\n"); } 
    132134      //Now check for text/bool/int values 
    133135      if(CTextValues.contains(var)){ HASH.insert(var,val); } 
Note: See TracChangeset for help on using the changeset viewer.