Changeset 16004f4


Ignore:
Timestamp:
05/09/14 07:38:30 (2 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.2
Children:
9bd0110, eaea8ff
Parents:
12db463d (diff), 41ed195 (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:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-softwaremanager/configDialog.cpp

    r4fc34c1 r41ed195  
    7676        } 
    7777      } 
     78      qDebug() << "Custom URL detected:" << cURL; 
    7879      if(!found){ 
    7980        //Add this repo as UNKNOWN 
  • src-qt4/pc-softwaremanager/configDialog.ui

    r7e0110b r41ed195  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>344</width> 
    10     <height>257</height> 
     9    <width>380</width> 
     10    <height>248</height> 
    1111   </rect> 
    1212  </property> 
     
    2323     <property name="title"> 
    2424      <string>Note: It may take a couple minutes to apply changes</string> 
     25     </property> 
     26     <property name="alignment"> 
     27      <set>Qt::AlignCenter</set> 
    2528     </property> 
    2629     <layout class="QVBoxLayout" name="verticalLayout_3"> 
  • src-sh/pc-updatemanager/pc-updatemanager

    reee006a r12db463d  
    971971  rc_halt "${PKG_CMD} update" 
    972972 
     973  # See if we need to update the jails pkgng config file 
     974  if [ -n "$INJAIL" -a "$1" = "-uppkgconfig" ] ; then 
     975     # Need to update pkgng config in the jail to match systems 
     976     jDir="`jls | grep " $INJAIL " | awk '{print $4}'`" 
     977     if [ ! -d "$jDir/usr/local/etc/pkg/repos" ] ; then 
     978        mkdir -p ${jDir}/usr/local/etc/pkg/repos 
     979     fi 
     980     cp /usr/local/etc/pkg/repos/pcbsd.conf ${jDir}/usr/local/etc/pkg/repos/ 
     981  fi 
     982 
    973983  ${PKG_CMD} ${PKG_FLAG} upgrade -n >/tmp/.pkgData.$$ 
    974984  if [ $? -ne 0 ] ; then 
     
    11131123        chbranch) get_update_file 
    11141124                  do_branch "${2}" ; break ;; 
    1115         pkgcheck) checkup_pkgs ; break ;; 
     1125        pkgcheck) shift ; checkup_pkgs "$1" ; break ;; 
    11161126       pkgupdate) update_pkgs "$2" ; break ;; 
    11171127finish-major-update) finish_major_fbsd_update ; break ;; 
Note: See TracChangeset for help on using the changeset viewer.