Changeset 30e1ce9


Ignore:
Timestamp:
Sep 26, 2013 1:42:52 PM (7 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
787268f
Parents:
8c6a630 (diff), 55ea386 (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:
1 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • src-sh/Makefile

    r651bd28 r55ea386  
    3535                sub-pcfirst \ 
    3636                sub-pbi \ 
    37                 sub-pbi10 \ 
    3837                sub-deinfo \ 
    3938                sub-meta \ 
     
    263262        cd pbi-manager/ && $(MAKE) -f $(MAKEFILE) install 
    264263 
    265 sub-pbi10: pbi-manager10/$(MAKEFILE) FORCE 
    266         cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) 
    267 sub-pbi10-make_default: pbi-manager10/$(MAKEFILE) FORCE 
    268         cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE)  
    269 sub-pbi10-make_first: pbi-manager10/$(MAKEFILE) FORCE 
    270         cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) first 
    271 sub-pbi10-all: pbi-manager10/$(MAKEFILE) FORCE 
    272         cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) all 
    273 sub-pbi10-clean: pbi-manager10/$(MAKEFILE) FORCE 
    274         cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) clean 
    275 sub-pbi10-install_subtargets: pbi-manager10/$(MAKEFILE) FORCE 
    276         cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) install 
    277  
    278264sub-meta: pc-metapkgmanager/$(MAKEFILE) FORCE 
    279265        cd pc-metapkgmanager/ && $(MAKE) -f $(MAKEFILE) 
     
    318304        sub-lpreserver-make_default \ 
    319305        sub-pbi-make_default \ 
    320         sub-pbi10-make_default \ 
    321306        sub-about-make_default \ 
    322307        sub-meta-make_default \ 
     
    341326        sub-lpreserver-make_first \ 
    342327        sub-pbi-make_first \ 
    343         sub-pbi10-make_first \ 
    344328        sub-about-make_first \ 
    345329        sub-meta-make_first \ 
     
    364348        sub-lpreserver-all \ 
    365349        sub-pbi-all \ 
    366         sub-pbi10-all \ 
    367350        sub-about-all \ 
    368351        sub-meta-all \ 
     
    385368 
    386369clean: sub-pbi-clean \ 
    387         sub-pbi10-clean \ 
    388370        sub-libsh-clean \ 
    389371        sub-lpreserver-clean \ 
     
    409391install_subtargets: sub-libsh-install_subtargets \ 
    410392        sub-pbi-install_subtargets \ 
    411         sub-pbi10-install_subtargets \ 
    412393        sub-lpreserver-install_subtargets \ 
    413394        sub-about-install_subtargets \ 
  • src-sh/de-info/de-profiles/gnome.profile

    r1620346 rbee06b9  
    1818which pc-metapkgmanager >/dev/null 2>/dev/null 
    1919if [ $? -eq 0 ] ; then 
    20   pc-metapkgmanager status GNOME | grep installed >/dev/null 
     20  pc-metapkgmanager status GNOME | grep "is installed" >/dev/null 
    2121  if [ $? -eq 0 ] ; then 
    2222    DE_INSTALLED=1 
  • src-sh/de-info/de-profiles/kde.profile

    r9dbaefd6 rbee06b9  
    2323which pc-metapkgmanager >/dev/null 2>/dev/null 
    2424if [ $? -eq 0 ] ; then 
    25   pc-metapkgmanager status KDE | grep installed >/dev/null 
     25  pc-metapkgmanager status KDE | grep "is installed" >/dev/null 
    2626  if [ $? -eq 0 ] ; then 
    2727    DE_INSTALLED=1 
  • src-sh/de-info/de-profiles/lxde.profile

    r1620346 rbee06b9  
    1919which pc-metapkgmanager >/dev/null 2>/dev/null 
    2020if [ $? -eq 0 ] ; then 
    21   pc-metapkgmanager status LXDE | grep installed >/dev/null 
     21  pc-metapkgmanager status LXDE | grep "is installed" >/dev/null 
    2222  if [ $? -eq 0 ] ; then 
    2323    DE_INSTALLED=1 
  • src-sh/de-info/de-profiles/xfce.profile

    r1620346 rbee06b9  
    2020which pc-metapkgmanager >/dev/null 2>/dev/null 
    2121if [ $? -eq 0 ] ; then 
    22   pc-metapkgmanager status XFCE | grep installed >/dev/null 
     22  pc-metapkgmanager status XFCE | grep "is installed">/dev/null 
    2323  if [ $? -eq 0 ] ; then 
    2424    DE_INSTALLED=1 
  • src-sh/pbi-manager/install.sh

    r651bd28 re747491  
    33 
    44# Check if this is for the right version of FreeBSD 
    5 verCheck="`grep '^#define __FreeBSD_version' /usr/include/sys/param.h | awk '{print $3}'`" 
    6 if [ $verCheck -gt 1000000 ] ; then 
    7   # This version is for FreeBSD <= 10 
    8   exit 0 
    9 fi 
     5#verCheck="`grep '^#define __FreeBSD_version' /usr/include/sys/param.h | awk '{print $3}'`" 
     6#if [ $verCheck -gt 1000000 ] ; then 
     7#  # This version is for FreeBSD <= 10 
     8#  exit 0 
     9#fi 
    1010 
    1111DEFAULT="/usr/local" 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/10_ktrueos

    r3f810665 r98ca661  
    2828# entries for them 
    2929 
     30ROOTFS=`mount | awk '/ \/ / {print $1}'` 
     31BEDS="$( echo ${ROOTFS} | awk -F '/' '{print $2}' )" 
     32 
    3033display_loaderopts() 
    3134{ 
     
    155158   do 
    156159      # Got a beadm snapshot, lets get the complete dataset name 
    157       beLine=`${BEADM} list -a | grep "/ROOT/${b}"` 
     160      beLine=`${BEADM} list -a | grep "/$BEDS/${b}"` 
    158161      cdataset=`echo $beLine | awk '{print $1}'` 
    159162      cdatadate=`echo $beLine | awk '{print $5}'` 
  • src-qt4/life-preserver/LPTray.cpp

    r108626c r8c6a630  
    7070    if(info[0] == "STARTED"){ 
    7171      this->showMessage( info[1], info[2], QSystemTrayIcon::Information, 5000); 
    72     }else if(info[0] == "RUNNING"){ 
    73       //don't show anything here - just let the tooltip update 
    7472    }else if(info[0] == "FINISHED"){ 
    7573      this->showMessage( info[1], info[2], QSystemTrayIcon::Information, 5000); 
    7674    }else if(info[0] == "ERROR"){ 
    77       this->showMessage( info[1], info[2], QSystemTrayIcon::Warning, 5000); 
     75      this->showMessage( info[1], info[2], QSystemTrayIcon::Warning, 10000); 
    7876    } 
    7977     
  • src-qt4/life-preserver/LPWatcher.cpp

    r108626c r8c6a630  
    8686  unsigned int base; 
    8787  if(type=="message"){base=10;} 
    88   else if(type=="replicate"){base=20;} 
     88  else if(type=="replication"){base=20;} 
    8989  else if(type=="critical"){base=30;} 
    9090  else if(type=="mirror"){base=40;} 
     
    158158      //Setup the file watcher for this new log file 
    159159      FILE_REPLICATION = dev; 
     160      dev = message.section(" ",5,5,QString::SectionSkipEmpty); 
    160161      startRepFileWatcher(); 
    161162      //Set the appropriate status variables 
    162       LOGS.insert(20,"REPSTARTED"); 
    163       // 21 - dataset set on update ping 
    164       LOGS.insert(22, tr("Replication Started") ); //summary 
    165       // 23 - Full message set on update ping 
     163      LOGS.insert(20,"STARTED"); 
     164      LOGS.insert(21, dev); //zpool 
     165      LOGS.insert(22, tr("Replication Starting") ); //summary 
     166      LOGS.insert(23, QString(tr("Starting replication for %1")).arg(dev) ); //Full message 
    166167      LOGS.insert(24, timestamp); //full timestamp 
    167168      LOGS.insert(25, time); // time only 
     
    171172      dev = message.section(" ",-1).simplified(); 
    172173      //Now set the status of the process 
    173       LOGS.insert(20,"REPFINISHED"); 
     174      LOGS.insert(20,"FINISHED"); 
    174175      LOGS.insert(21,dev); //dataset 
    175176      LOGS.insert(22, tr("Finished Replication") ); //summary 
     
    178179      LOGS.insert(25, time); // time only       
    179180      if(!quiet){ emit MessageAvailable("replication"); } 
    180     }else if( message.contains("FAILED replication") ){ 
     181    }else if( message.contains("failed replication") ){ 
    181182      stopRepFileWatcher(); 
    182183      //Now set the status of the process 
     
    184185      QString file = log.section("LOGFILE:",1,1).simplified(); 
    185186      QString tt = QString(tr("Replication Failed for %1")).arg(dev) +"\n"+ QString(tr("Logfile available at: %1")).arg(file); 
    186       LOGS.insert(20,"REPERROR"); 
     187      LOGS.insert(20,"ERROR"); 
    187188      LOGS.insert(21,dev); //dataset 
    188189      LOGS.insert(22, tr("Replication Failed") ); //summary 
     
    196197} 
    197198 
    198 void LPWatcher::readReplicationFile(bool quiet){ 
     199void LPWatcher::readReplicationFile(){ 
    199200  QString stat; 
    200201  while( !RFSTREAM->atEnd() ){  
     
    203204    else if(line.startsWith("send from ")){} 
    204205    else if(line.startsWith("TIME ")){} 
     206    else if(line.startsWith("warning: ")){} //start of an error 
    205207    else{ stat = line; } //only save the relevant/latest status line 
    206208  } 
    207   if(stat.isEmpty()){ 
    208     qDebug() << "New Status Message:" << stat; 
     209  if(!stat.isEmpty()){ 
     210    //qDebug() << "New Status Message:" << stat;             
    209211    //Divide up the status message into sections 
    210212    stat.replace("\t"," "); 
     
    233235      LOGS.insert(20,"RUNNING"); 
    234236      LOGS.insert(21,dataset); 
     237      LOGS.insert(22,txt); 
    235238      LOGS.insert(23,txt); 
    236       if(!quiet){ emit MessageAvailable("replication"); } 
     239      emit MessageAvailable(""); 
    237240    } 
    238241  } 
     
    240243 
    241244void LPWatcher::startRepFileWatcher(){ 
     245  //qDebug() << "Start Rep File Watcher:" << FILE_REPLICATION; 
    242246  if(FILE_REPLICATION.isEmpty()){ return; } 
     247 
     248  if(watcher->files().contains(FILE_REPLICATION)){ return; } //duplicate - file already opened 
     249  else if(!watcher->files().isEmpty()){  
     250    //Check that the file watcher is not already operating on a file 
     251    // only one can be running at a time, so always cancel the previous instance (it is stale) 
     252    QString tmp = FILE_REPLICATION; 
     253    stopRepFileWatcher(); 
     254    FILE_REPLICATION = tmp; 
     255  } 
     256  //Check to make sure that lpreserver actually has a process running before starting this 
     257  //if(!QFile::exists("/var/run/<something.pid>"){ FILE_REPLICATION.clear(); return; } 
     258  //Check for the existance of the file to watch and create it as necessary   
    243259  if(!QFile::exists(FILE_REPLICATION)){ system( QString("touch "+FILE_REPLICATION).toUtf8() ); } 
     260  //Now open the file and start watching it for changes 
    244261  repfile->setFileName(FILE_REPLICATION); 
    245262  repfile->open(QIODevice::ReadOnly | QIODevice::Text); 
    246263  RFSTREAM = new QTextStream(repfile); 
    247264  watcher->addPath(FILE_REPLICATION); 
     265  //qDebug() << "Finished starting rep file watcher"; 
    248266} 
    249267 
    250268void LPWatcher::stopRepFileWatcher(){ 
     269  //qDebug() << "Stop Rep File Watcher:" << FILE_REPLICATION; 
    251270  if(FILE_REPLICATION.isEmpty()){ return; } 
    252271  watcher->removePath(FILE_REPLICATION); 
     
    256275  repTotK.clear(); 
    257276  lastSize.clear(); 
     277  //qDebug() << "Finished stopping rep file watcher"; 
    258278} 
    259279 
  • src-qt4/life-preserver/LPWatcher.h

    r220bbd4 r8c6a630  
    4444 
    4545        void readLogFile(bool quiet = false); 
    46         void readReplicationFile(bool quiet = false); 
     46        void readReplicationFile(); //always sends quiet signals 
    4747 
    4848        void startRepFileWatcher(); 
Note: See TracChangeset for help on using the changeset viewer.