Changeset 8204877


Ignore:
Timestamp:
01/23/15 07:22:09 (2 months ago)
Author:
Kris Moore <kris@…>
Branches:
releng/10.1.1
Children:
a1f1b2d
Parents:
f2d971e (diff), 9107eac (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 'releng/10.1.1' of github.com:pcbsd/pcbsd into releng/10.1.1

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src-qt5/pc-updategui/mainUI.cpp

    r5787058 r3536549  
    3535  //Initialize the log file watcher 
    3636  watcher = new QFileSystemWatcher(this); 
    37     watcher->addPath(UPDATE_LOG_FILE); 
     37    watcher->addPath(UPDATE_LOG_FILE_RUNNING); 
    3838         
    3939  //Create/set the list of auto-update options   
     
    171171  //Now make sure that the log file is being watched (in case it did not exist earlier) 
    172172  if(watcher->files().isEmpty()){ 
    173     watcher->addPath(UPDATE_LOG_FILE); 
     173    watcher->addPath(UPDATE_LOG_FILE_RUNNING); 
    174174  } 
    175175} 
     
    231231  //Check that the tab is visible(don't want to constantly be reading the file if not visible) 
    232232  if(ui->tabWidget->currentWidget()==ui->tab_log){ 
    233     QString log = pcbsd::Utils::readTextFile(UPDATE_LOG_FILE); 
     233    QString log = pcbsd::Utils::readTextFile(UPDATE_LOG_FILE_RUNNING); 
     234    if(log.isEmpty()){ log = pcbsd::Utils::readTextFile(UPDATE_LOG_FILE); } 
    234235    //QString clog = ui->text_log->toPlainText(); 
    235236    //if(clog.length() > log.length() || clog.isEmpty() ){ 
  • src-qt5/pc-updategui/mainUI.h

    r00ef2df9 r3536549  
    99#include <pcbsd-utils.h> 
    1010 
    11 #define UPDATE_LOG_FILE QString("/var/log/pc-updatemanager.log") 
     11#define UPDATE_LOG_FILE_RUNNING QString("/var/log/pc-updatemanager.log") 
     12#define UPDATE_LOG_FILE QString("/var/log/pc-updatemanager-auto.log") 
    1213 
    1314namespace Ui{ 
  • src-qt5/config.h

    r20f52dc rf2d971e  
    2727// Set the PC-BSD specific version string for our utils 
    2828// When you update this tag, be sure to update ../src-sh/config.sh as well 
    29 #define PCBSDVERSION QString("10.1.1-RC1") 
     29#define PCBSDVERSION QString("10.1.1-RC2") 
    3030 
    3131// Set the LOCALBASE 
  • src-sh/pcbsd-utils/config.sh

    r20f52dc rf2d971e  
    44# Set the PC-BSD version number 
    55# When you update this tag, be sure to update ../src-qt4/config.h as well 
    6 export PCBSDVERSION="10.1.1-RC1" 
     6export PCBSDVERSION="10.1.1-RC2" 
    77 
    88# When rolling ISOs, what package set to use on fresh installs? 
Note: See TracChangeset for help on using the changeset viewer.