Changeset abf6336


Ignore:
Timestamp:
02/03/14 11:09:39 (14 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1
Children:
d22fc5d
Parents:
5e38281 (diff), 77024b5 (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 added
10 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    re8a4eae r77024b5  
    12071207src-qt4/pc-zmanager/ui_dialogprop.h 
    12081208src-qt4/pc-zmanager/ui_zmanagerwindow.h 
     1209src-qt4/pc-pkgmanager/ui_dialogConfig.h 
     1210src-qt4/pc-sysmanager/pc-sysmanager 
     1211src-qt4/pc-sysmanager/ui_cmdDialog.h 
     1212src-sh/pbi-manager/install 
     1213src-sh/pbi-manager/mount_nullfs/mount_nullfs 
     1214src-sh/pbi-manager/pbime/pbime 
     1215src-sh/warden/install 
     1216 
  • src-qt4/pc-pkgmanager/mainWin.cpp

    rf5f85ce r77024b5  
    3939  connect(pushPkgApply, SIGNAL( clicked() ), this, SLOT( slotApplyClicked() ) ); 
    4040  connect(action_Quit, SIGNAL( triggered(bool) ), this, SLOT( slotCloseClicked() ) ); 
     41  connect(action_Configuration, SIGNAL( triggered(bool) ), this, SLOT( slotConfigClicked() ) ); 
    4142  connect(tool_search, SIGNAL( clicked() ), this, SLOT( slotSearchPackages() ) ); 
    4243  connect(line_search, SIGNAL( returnPressed()), this, SLOT( slotSearchPackages()) ); 
     
    289290  uPackages = false; 
    290291 
     292  // Set the type of pkg command 
     293  pkgProcessType="update"; 
     294 
    291295  // Init the pkg process 
    292296  prepPkgProcess(); 
     
    567571  } 
    568572 
     573  // Eventually we will have more stuff to do after running a package command 
     574  //if ( pkgProcessType == "update" ) 
     575  //{ 
     576  //} 
     577 
    569578  // Nothing left to run! Lets wrap up 
    570579  QFile sysTrig( SYSTRIGGER ); 
     
    606615  //Make sure the search box is disabled at startup 
    607616  tool_search->setEnabled(false); 
     617 
     618  // We will refresh the update tab after, clear it out for now 
     619  buttonRescanPkgs->setEnabled(false); 
     620  pushUpdatePkgs->setEnabled(false); 
     621  listViewUpdatesPkgs->clear(); 
     622  groupUpdatesPkgs->setTitle(tr("Reading package database...")); 
    608623 
    609624  // Running in basic mode 
     
    947962   
    948963  if ( ! pkgRemoveList.isEmpty() ) { 
     964    pkgProcessType="delete"; 
    949965    if ( wDir.isEmpty() ) 
    950966      pCmds << "pkg" << "delete" << "-R" << "-y" << pkgRemoveList.join(" "); 
     
    958974  // Adding packages 
    959975  if ( ! pkgAddList.isEmpty() ) { 
     976    pkgProcessType="add"; 
    960977 
    961978    // Look for conflicts first 
     
    11781195 
    11791196  if ( ! delPkgs.isEmpty() ) { 
     1197    pkgProcessType="deletemeta"; 
    11801198    if ( wDir.isEmpty() ) 
    11811199      pCmds << "pc-metapkgmanager" << "del" << delPkgs; 
     
    11881206 
    11891207  if ( ! addPkgs.isEmpty() ) { 
     1208    pkgProcessType="addmeta"; 
    11901209    if ( wDir.isEmpty() ) 
    11911210      pCmds << "pc-metapkgmanager" << "add" << addPkgs; 
     
    15751594 
    15761595} 
     1596 
     1597void mainWin::slotConfigClicked() 
     1598{ 
     1599   configD = new dialogConfig(); 
     1600   connect(configD, SIGNAL(ok()),this, SLOT(slotConfigFinished()) ); 
     1601   configD->programInit(); 
     1602   configD->show(); 
     1603} 
     1604 
     1605void mainWin::slotConfigFinished() 
     1606{ 
     1607   // Changed view, lets refresh 
     1608   initMetaWidget(); 
     1609} 
  • src-qt4/pc-pkgmanager/mainWin.h

    rfa2ad6e r77024b5  
    1717#include <pcbsd-ui.h> 
    1818#include "dialogConfirm.h" 
     19#include "dialogConfig.h" 
    1920#include "ui_mainWin.h" 
    2021#include "../config.h" 
     
    7980 
    8081    void slotReadEventPipe(); 
     82 
     83    // Configuration dialog 
     84    void slotConfigClicked(); 
     85    void slotConfigFinished(); 
    8186 
    8287private: 
     
    161166    QProcess *eP; 
    162167 
     168    // Config dialog 
     169    dialogConfig *configD; 
     170 
     171    // Indicator of package process type 
     172    QString pkgProcessType; 
     173 
    163174signals: 
    164175 
  • src-qt4/pc-pkgmanager/mainWin.ui

    re55b4d0 re62a5d2  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>800</width> 
     9    <width>913</width> 
    1010    <height>644</height> 
    1111   </rect> 
     
    459459     <x>0</x> 
    460460     <y>0</y> 
    461      <width>800</width> 
     461     <width>913</width> 
    462462     <height>22</height> 
    463463    </rect> 
     
    467467     <string>&amp;File</string> 
    468468    </property> 
     469    <addaction name="action_Configuration"/> 
     470    <addaction name="separator"/> 
    469471    <addaction name="action_Quit"/> 
    470472   </widget> 
     
    493495   </property> 
    494496   <property name="text"> 
    495     <string>&amp;Basic</string> 
     497    <string>&amp;Basic (Meta-Packages)</string> 
    496498   </property> 
    497499  </action> 
     
    501503   </property> 
    502504   <property name="text"> 
    503     <string>&amp;Advanced</string> 
     505    <string>&amp;Advanced (All Packages)</string> 
     506   </property> 
     507  </action> 
     508  <action name="action_Preferences"> 
     509   <property name="text"> 
     510    <string>&amp;Configuration</string> 
     511   </property> 
     512  </action> 
     513  <action name="action_Configuration"> 
     514   <property name="text"> 
     515    <string>&amp;Configuration</string> 
    504516   </property> 
    505517  </action> 
  • src-qt4/pc-pkgmanager/pc-pkgmanager.pro

    r1b89eeb re62a5d2  
    77INCLUDEPATH     += ../libpcbsd/utils ../libpcbsd/ui /usr/local/include 
    88 
    9 HEADERS += mainWin.h dialogConfirm.h 
     9HEADERS += mainWin.h dialogConfirm.h dialogConfig.h 
    1010 
    11 SOURCES += main.cpp mainWin.cpp dialogConfirm.cpp 
     11SOURCES += main.cpp mainWin.cpp dialogConfirm.cpp dialogConfig.cpp 
    1212 
    13 FORMS   = mainWin.ui dialogConfirm.ui 
     13FORMS   = mainWin.ui dialogConfirm.ui dialogConfig.ui 
    1414 
    1515RESOURCES = pc-pkgmanager.qrc  
  • src-qt4/pc-sysmanager/pbsystemtab.cpp

    r1c0e4984 re62a5d2  
    181181void PBSystemTab::loadMiscData() 
    182182{ 
    183     // Load the default package set value 
    184     if ( pcbsd::Utils::getValFromPCBSDConf("PACKAGE_SET") == "EDGE" ) { 
    185        radioEdge->setChecked(true); 
    186        radioProduction->setChecked(false); 
    187     } else { 
    188        radioProduction->setChecked(true); 
    189        radioEdge->setChecked(false); 
    190     } 
    191183    //Check if IBUS input is forced 
    192184    if ( pcbsd::Utils::getConfFileValue(QString(PREFIX + "/share/pcbsd/xstartup/enable-ibus.sh"), QString("FORCEIBUS=") ) == QString("YES")){ 
     
    204196        pcbsd::Utils::setConfFileValue(PREFIX + "/share/pcbsd/xstartup/enable-ibus.sh", "FORCEIBUS", "FORCEIBUS=\"NO\"", 1); 
    205197     } 
    206  
    207     // Save package set 
    208     if ( radioProduction->isChecked() ) 
    209       pcbsd::Utils::setValPCBSDConf("PACKAGE_SET", "PRODUCTION"); 
    210     else 
    211       pcbsd::Utils::setValPCBSDConf("PACKAGE_SET", "EDGE"); 
    212  
    213     // Extract the ports overlay to grab a new package set repo config 
    214     QProcess::execute(QString("pc-extractoverlay"), QStringList() << "ports"); 
    215198} 
    216199 
  • src-qt4/pc-sysmanager/pbsystemtab.ui

    ra4325b4 re62a5d2  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>471</width> 
     9    <width>519</width> 
    1010    <height>387</height> 
    1111   </rect> 
     
    567567      </attribute> 
    568568      <layout class="QGridLayout" name="gridLayout_3"> 
    569        <item row="2" column="0" colspan="3"> 
     569       <item row="1" column="0" colspan="3"> 
    570570        <spacer name="spacer37"> 
    571571         <property name="orientation"> 
     
    583583        </spacer> 
    584584       </item> 
    585        <item row="3" column="1"> 
     585       <item row="2" column="1"> 
    586586        <widget class="QPushButton" name="pushMiscSave"> 
    587587         <property name="text"> 
     
    590590        </widget> 
    591591       </item> 
    592        <item row="3" column="0"> 
     592       <item row="2" column="0"> 
    593593        <spacer name="horizontalSpacer_9"> 
    594594         <property name="orientation"> 
     
    603603        </spacer> 
    604604       </item> 
    605        <item row="1" column="0" colspan="3"> 
     605       <item row="0" column="0" colspan="3"> 
    606606        <widget class="QGroupBox" name="groupBox_6"> 
    607607         <property name="title"> 
     
    613613            <property name="text"> 
    614614             <string>Force IBUS keyboard input</string> 
    615             </property> 
    616            </widget> 
    617           </item> 
    618          </layout> 
    619         </widget> 
    620        </item> 
    621        <item row="0" column="0" colspan="2"> 
    622         <widget class="QGroupBox" name="groupBox"> 
    623          <property name="title"> 
    624           <string>Package Set</string> 
    625          </property> 
    626          <layout class="QGridLayout" name="gridLayout_20"> 
    627           <item row="0" column="0"> 
    628            <widget class="QRadioButton" name="radioProduction"> 
    629             <property name="text"> 
    630              <string>Production (Packages updated quarterly - Recommended)</string> 
    631             </property> 
    632             <property name="checked"> 
    633              <bool>true</bool> 
    634             </property> 
    635            </widget> 
    636           </item> 
    637           <item row="1" column="0"> 
    638            <widget class="QRadioButton" name="radioEdge"> 
    639             <property name="text"> 
    640              <string>Edge (Packages updated frequently - For testing and development)</string> 
    641615            </property> 
    642616           </widget> 
  • src-qt4/PCDM/src/main.cpp

    raf50abb r5e38281  
    3939  //clock.start(); 
    4040  Backend::checkLocalDirs();  // Create and fill "/usr/local/share/PCDM" if needed 
    41   Backend::openLogFile("/var/log/PCDM.log");   
     41  Backend::openLogFile("/var/log/PCDM.log");  
     42  qDebug() << "PCDM Log File: /var/log/PCDM.log"; 
    4243  //qDebug() << "Backend Checks Finished:" << QString::number(clock.elapsed())+" ms"; 
    4344  //Setup the initial system environment (locale, keyboard) 
  • src-qt4/PCDM/src/pcdm-backend.cpp

    r733b811 r5e38281  
    224224 
    225225void Backend::openLogFile(QString logFilePath){ 
    226   //If a log file exists, remove it 
    227   if(QFile::exists(logFilePath)){ QFile::remove(logFilePath); } 
     226  //If a log file exists, move it to *.old 
     227  if(QFile::exists(logFilePath)){  
     228    if(QFile::exists(logFilePath+".old")){ QFile::remove(logFilePath+".old"); } 
     229    QFile::rename(logFilePath, logFilePath+".old");  
     230  } 
    228231  //save the path to the logfile 
    229232  logFile = logFilePath; 
  • src-qt4/PCDM/src/pcdm-xprocess.cpp

    r3db4432 r5e38281  
    2929  pam_session_open = FALSE; 
    3030  //Setup the finished signal/slot 
    31   connect( this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) ); 
     31  //connect( this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) ); 
    3232} 
    3333 
     
    6969 
    7070bool XProcess::startXSession(){ 
    71   disconnect(SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) ); 
     71  //disconnect(SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) ); 
    7272  //Check that the necessary info to start the session is available 
    7373  if( xuser.isEmpty() || xcmd.isEmpty() || xhome.isEmpty() || xde.isEmpty() ){ 
     
    9999  // Get the environment before we drop priv 
    100100  this->setProcessEnvironment( QProcessEnvironment::systemEnvironment() ); //current environment 
     101  //Emit the last couple logs before dropping privileges 
     102  Backend::log("Starting session:"); 
     103  Backend::log(" - Session Log: ~/.pcdm-startup.log"); 
    101104  //Now allow this user access to the Xserver 
    102105  QString xhostcmd = "xhost si:localuser:"+xuser; 
     
    132135  cmd.append("dbus-launch --exit-with-session "+xcmd); 
    133136  //cmd.append(xcmd); 
    134   //cmd.append("; kill -l KILL"); //to clean up the session afterwards 
     137 
    135138  //Backend::log("Startup command: "+cmd); 
    136139  // Setup the process environment 
    137140  setupSessionEnvironment(); 
    138141  //Log the DE startup outputs as well 
     142  this->setProcessChannelMode(QProcess::MergedChannels); 
    139143  this->setStandardOutputFile(xhome+"/.pcdm-startup.log",QIODevice::Truncate); 
    140   this->setStandardErrorFile(xhome+"/.pcdm-startup.err",QIODevice::Truncate); 
     144  //this->setStandardErrorFile(xhome+"/.pcdm-startup.err",QIODevice::Truncate); 
    141145  // Startup the process(s) 
    142146   //  - Setup to run the user's <home-dir>/.xprofile startup script 
    143   Backend::log("Starting session:"); 
    144147  if(QFile::exists(xhome+"/.xprofile")){ 
    145148    //Make sure the file is executable 
     
    149152    contents << ". "+xhome+"/.xprofile"; 
    150153    contents << cmd; //end with the actual command for the DE 
     154    contents << "exit $?"; //Make sure we return the DE return value 
    151155    if( Backend::writeFile(xhome+"/.pcdmsessionstart", contents) ){ 
    152156      //script created fine, change the command to just run it 
     
    154158    }else{ 
    155159      //Could not create script file, fallback on running them seperately 
    156       Backend::log(" --Run user ~/.xprofile"); 
    157160      QString xpro = "sh "+xhome+"/.xprofile"; 
    158161      this->start(xpro); 
     
    166169 
    167170void XProcess::slotCleanup(){ 
     171  Backend::log("Session Finished\n - Return Code: "+ QString::number(this->exitCode()) ); 
    168172  pam_shutdown(); //make sure that PAM shuts down properly 
    169173  //Now remove this user's access to the Xserver 
Note: See TracChangeset for help on using the changeset viewer.