Changeset cec4c86b


Ignore:
Timestamp:
09/25/13 08:51:04 (11 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
98ca661, 8c6a630
Parents:
108626c (diff), 5e0ae79 (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:
2 added
10 edited

Legend:

Unmodified
Added
Removed
  • build-files/ports-overlay/sysutils/grub2/Makefile

    r667321a r0a435b9  
    11# Created by: sem@FreeBSD.org 
    2 # $FreeBSD: sysutils/grub2/Makefile 316596 2013-04-26 10:44:28Z ak $ 
     2# $FreeBSD$ 
    33 
    44PORTNAME=       grub2 
     
    1818 
    1919CONFLICTS=      grub-0* 
     20SSP_UNSAFE=     yes 
    2021USE_XZ=         yes 
    21 USE_GCC=        4.6+ 
     22USE_GCC=        yes 
    2223USE_AUTOTOOLS=  automake aclocal autoconf 
    2324ACLOCAL_ARGS=   -Im4 
     
    4546                grub-install.8 grub-sparc64-setup.8 grub-ofpathname.8 
    4647 
     48NO_STAGE=       yes 
    4749.include <bsd.port.pre.mk> 
    4850 
  • src-qt4/libpcbsd/utils/pcbsd-utils.h

    r1620346 r7c7f02c  
    131131   static bool setValPBIConf(QString key, QString val); 
    132132   static bool setValSHFile(QString, QString, QString); 
     133   static bool setValSHFile(QString, QString, QString, QString); 
    133134   static bool setValCSHFile(QString, QString, QString); 
    134135   static bool setValPCBSDConf(QString key, QString val); 
  • src-qt4/libpcbsd/utils/utils.cpp

    rc3ae393 r7c7f02c  
    145145     line = stream.readLine(); 
    146146     if ( line.indexOf(envVal + "=") == 0 ) { 
    147         // Strip any "" 
    148147        line.replace(envVal + "=", ""); 
    149148 
     149        // Remove the ' or " from variable 
     150        if ( line.indexOf("'") == 0 ) { 
     151           line = line.section("'", 1, 1); 
     152           line = line.section("'", 0, 0); 
     153        }  
    150154        if ( line.indexOf('"') == 0 ) { 
    151155           line = line.section('"', 1, 1); 
     
    183187} 
    184188 
    185  
    186189bool Utils::setValSHFile(QString envFile, QString envName, QString envVal) 
     190{ 
     191        return setValSHFile(envFile, envName, envVal, QString('"')); 
     192} 
     193 
     194bool Utils::setValSHFile(QString envFile, QString envName, QString envVal, QString quote) 
    187195{ 
    188196  QFile confFile(envFile); 
     
    199207     if ( line.indexOf(envName + "=") == 0 ) { 
    200208        if ( ! envVal.isEmpty() && ! added ) 
    201           shConf << envName + "=\"" + envVal + "\" ; export " + envName; 
     209          shConf << envName + "=" + quote + envVal + quote + " ; export " + envName; 
    202210        added = true; 
    203211     } else { 
     
    209217 
    210218  if (! added && ! envVal.isEmpty() ) 
    211     shConf << envName + "=\"" + envVal + "\" ; export " + envName; 
     219    shConf << envName + "=" + quote + envVal + quote + " ; export " + envName; 
    212220 
    213221  if ( confFile.open( QIODevice::WriteOnly ) ) { 
     
    278286        if ( val.isEmpty() ) 
    279287           return QString(); 
    280         return val.section(":", 3, 3).section("'", 1, 1); 
     288        return val.section(":", 3, 3); 
    281289} 
    282290 
     
    362370   setValCSHFile(QString("/etc/csh.cshrc"), QString("https_proxy"), val); 
    363371   setValCSHFile(QString("/etc/csh.cshrc"), QString("no_proxy"), "127.0.0.1,localhost"); 
    364    setValSHFile(QString("/etc/profile"), QString("HTTP_PROXY"), val); 
    365    setValSHFile(QString("/etc/profile"), QString("HTTPS_PROXY"), val); 
     372   setValSHFile(QString("/etc/profile"), QString("HTTP_PROXY"), val, "'"); 
     373   setValSHFile(QString("/etc/profile"), QString("HTTPS_PROXY"), val, "'"); 
    366374   setValSHFile(QString("/etc/profile"), QString("NO_PROXY"), "127.0.0.1,localhost"); 
    367    setValSHFile(QString("/etc/profile"), QString("http_proxy"), val); 
    368    setValSHFile(QString("/etc/profile"), QString("https_proxy"), val); 
     375   setValSHFile(QString("/etc/profile"), QString("http_proxy"), val, "'"); 
     376   setValSHFile(QString("/etc/profile"), QString("https_proxy"), val, "'"); 
    369377   setValSHFile(QString("/etc/profile"), QString("no_proxy"), "127.0.0.1,localhost"); 
    370378   return true; 
     
    373381bool Utils::setProxyAuth(QString val) { 
    374382   setValCSHFile(QString("/etc/csh.cshrc"), QString("HTTP_PROXY_AUTH"), val); 
    375    return setValSHFile(QString("/etc/profile"), QString("HTTP_PROXY_AUTH"), val); 
     383   return setValSHFile(QString("/etc/profile"), QString("HTTP_PROXY_AUTH"), val, "'"); 
    376384} 
    377385 
  • src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp

    rc3ae393 r7c7f02c  
    10391039                authLine="digest:*:"; 
    10401040          authLine += lineProxyUser->text() + ":"; 
    1041           authLine += "'" + lineProxyPass->text() + "'"; 
     1041          authLine += lineProxyPass->text(); 
    10421042          pcbsd::Utils::setProxyAuth(authLine); 
    10431043        } 
  • src-qt4/port-files/Makefile

    r95920e9 r5e0ae79  
    3636WRKSRC=         ${WRKDIR}/src-qt4 
    3737HAS_CONFIGURE=  yes 
     38NO_STAGE=       yes 
    3839 
    3940QMAKE_PRO=      src-qt4.pro 
  • src-sh/port-files/Makefile

    r4c93e17 r5e0ae79  
    2828CONFLICTS?=     pbi-manager-[0-9]* 
    2929NO_BUILD=       yes 
     30NO_STAGE=       yes 
    3031USE_BZIP2=      yes 
    3132USE_PYTHON=     yes 
  • src-qt4/life-preserver/LPMain.ui

    ra194d99 r108626c  
    173173        <item> 
    174174         <widget class="QLabel" name="label_replication"> 
     175          <property name="statusTip"> 
     176           <string/> 
     177          </property> 
    175178          <property name="styleSheet"> 
    176            <string notr="true">background-color: rgba(10,200,10,100)</string> 
     179           <string notr="true">background-color: rgba(10,200,10,100); border-radius: 5px</string> 
    177180          </property> 
    178181          <property name="text"> 
     
    190193         <widget class="QLabel" name="label_mirror"> 
    191194          <property name="styleSheet"> 
    192            <string notr="true">background-color: rgba(10,100,200,100)</string> 
     195           <string notr="true">background-color: rgba(10,100,200,100); border-radius: 5px</string> 
    193196          </property> 
    194197          <property name="text"> 
     
    206209         <widget class="QLabel" name="label_errors"> 
    207210          <property name="styleSheet"> 
    208            <string notr="true">background-color: rgba(230,10,10,100)</string> 
     211           <string notr="true">background-color: rgba(230,10,10,100); border-radius: 5px</string> 
    209212          </property> 
    210213          <property name="text"> 
     
    237240          <item> 
    238241           <widget class="QToolButton" name="tool_prevsnap"> 
     242            <property name="statusTip"> 
     243             <string>Select the previous (older) snapshot</string> 
     244            </property> 
    239245            <property name="styleSheet"> 
    240246             <string notr="true"/> 
     
    284290          <item> 
    285291           <widget class="QToolButton" name="tool_nextsnap"> 
     292            <property name="statusTip"> 
     293             <string>Select the next (more recent) snapshot</string> 
     294            </property> 
    286295            <property name="text"> 
    287296             <string>Next</string> 
  • src-qt4/life-preserver/LPTray.cpp

    re9760d0 r108626c  
    3535  if( watcher->hasError() ){ 
    3636    //Errors - show that attention is required 
    37     this->setIcon( QIcon(":/images/tray-icon-failed.png") ); 
     37    this->setIcon( QIcon(":/images/tray-icon-error.png") ); 
    3838  }else if( watcher->isRunning() ){ 
    3939    //Show the working icon 
    40     this->setIcon( QIcon(":/images/tray-icon-active7.png") ); 
     40    this->setIcon( QIcon(":/images/tray-icon-working.png") ); 
    4141  }else{ 
    4242    //Show the idle icon 
  • src-qt4/life-preserver/LPWatcher.cpp

    r04144d6 r108626c  
    378378          QString errors = zstat[i].section(" ", 6,6,QString::SectionSkipEmpty); 
    379379          //Setup the running re-silvering progress 
    380           if(LOGS.contains(50)){newresilver=true; } //don't display message for first run 
     380          if(LOGS.value(50) != "FINISHED" && LOGS.value(50) != "ERROR" ){newresilver=true; } //don't display message for first run 
    381381          if(errors.toInt() > 0){  
    382382            LOGS.insert(50, "ERROR"); 
  • src-qt4/life-preserver/lPreserve.qrc

    r4019f37 r108626c  
    11<RCC> 
    22  <qresource> 
     3    <file>images/tray-icon-error.png</file> 
     4    <file>images/tray-icon-working.png</file> 
    35    <file>images/next.png</file> 
    46    <file>images/previous.png</file> 
Note: See TracChangeset for help on using the changeset viewer.