Changeset ab75b85


Ignore:
Timestamp:
11/15/13 10:05:38 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
6d26aab
Parents:
1211b75 (diff), a819105 (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:
4 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/PCDMd

    ref7d8db r89cdf9c7  
    55 
    66PCDMCONF="/usr/local/etc/pcdm.conf" 
    7 PCDMAUTHFILE="/tmp/.PCDMAuth" 
     7BASEPCDMAUTHFILE="/tmp/.PCDMAuth" 
    88 
    99XOPTS="" 
     
    3939while [ ! -e /var/run/nologin ]; do 
    4040  /usr/local/bin/pc-checkxdisplay 
     41  # Randomize the authorization file location 
     42  PCDMAUTHFILE=${BASEPCDMAUTHFILE}-`openssl rand -hex 10` 
    4143  # Make sure the authorization file does not exist 
    4244  if [ -f ${PCDMAUTHFILE} ]; then 
     
    5153  fi 
    5254  xinit /usr/local/bin/PCDM-session -once -- :0 -auth ${PCDMAUTHFILE} $XOPTS 
     55  #Now remove the authorization file 
     56  rm ${PCDMAUTHFILE} 
    5357done 
  • src-qt4/pc-pkgmanager/main.cpp

    r395de4d r1211b75  
    4141       QString chkarg = argv[1]; 
    4242       // Running in a chroot 
    43        if ( chkarg == "-chroot" ) 
     43       if ( chkarg == "-chroot" ) { 
    4444         if( argc == 3 ){ 
    4545           chroot = argv[2]; 
     
    4848           exit(1); 
    4949         } 
     50       } 
    5051   } 
    5152 
  • src-qt4/pc-pkgmanager/mainWin.cpp

    r395de4d r1211b75  
    226226     QCoreApplication::processEvents(); 
    227227 
     228  if ( p.exitCode() != 0 ) 
     229    QMessageBox::warning(this, tr("Package Check"), tr("Unable to check for package updates!")); 
     230 
    228231  while (p.canReadLine()) { 
    229232    line = p.readLine().simplified(); 
     
    12221225          for (int z=0; z < metaPkgList.count(); ++z) 
    12231226            // See if any packages status have changed 
    1224             if ( (*it)->text(0) == metaPkgList.at(z).at(0) && metaPkgList.at(z).at(5) == "YES" && (*it)->checkState(0) == Qt::Unchecked ) 
     1227            if ( (*it)->text(0) == metaPkgList.at(z).at(0) && metaPkgList.at(z).at(5) == "YES" && (*it)->checkState(0) == Qt::Unchecked ) { 
    12251228                if ( tmp.isEmpty() ){ 
    12261229                        tmp = (*it)->text(0); 
     
    12281231                        tmp = tmp + "," + (*it)->text(0); 
    12291232                } 
     1233            } 
    12301234         ++it; 
    12311235        } 
  • src-sh/pc-updatemanager/pc-updatemanager

    r65f3853c r1211b75  
    553553checkup_pkgs() { 
    554554 
    555   # Checkout the installed pkgs and compare to master list 
     555  # Update the repo DB 
    556556  rc_halt "pkg-static update" 
     557 
    557558  pkg-static upgrade -n >/tmp/.pkgData.$$ 
     559  if [ $? -ne 0 ] ; then 
     560     echo "Error checking for package updates..." 
     561     exit 1 
     562  fi 
     563 
     564  # Check fr updates now 
    558565  grep -q "Upgrading" /tmp/.pkgData.$$ 
    559566  if [ $? -ne 0 ] ; then 
Note: See TracChangeset for help on using the changeset viewer.