Changeset f758657


Ignore:
Timestamp:
03/19/14 10:36:07 (16 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
f4533dc
Parents:
5a917f1
Message:

Fix installing src / ports if chosen

Location:
src-qt4/pc-installgui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-installgui/installer.cpp

    rca97cef rf758657  
    876876  if ( Arch == "amd64" ) 
    877877     distFiles+=" lib32"; 
     878 
     879  // Check for ports / src sources 
     880  if ( fSRC ) 
     881     distFiles+=" src"; 
     882  if ( fPORTS ) 
     883     distFiles+=" ports"; 
    878884 
    879885  // System type we are installing 
     
    9971003  if ( ! radioRestore->isChecked() ) { 
    9981004 
    999     cfgList+=getComponentCfgSettings(); 
    1000  
    10011005    // Save the install config script to disk 
    10021006    cfgList << "runExtCommand=/root/save-config.sh"; 
     
    15641568 
    15651569  } // end of while loop 
    1566 } 
    1567  
    1568 // Return list of components to install 
    1569 QStringList Installer::getComponentCfgSettings() 
    1570 { 
    1571   QStringList componentList, com; 
    1572   if ( fSRC ) 
    1573     com << "src"; 
    1574   if ( fPORTS ) 
    1575     com << "ports"; 
    1576  
    1577   if ( ! com.isEmpty() ) { 
    1578     componentList << ""; 
    1579     componentList << "# Optional Components"; 
    1580     componentList << "installComponents=" + com.join(","); 
    1581   } 
    1582  
    1583   return componentList; 
    15841570} 
    15851571 
  • src-qt4/pc-installgui/installer.h

    r618401b rf758657  
    9999    QStringList getGlobalCfgSettings(); 
    100100    QStringList getDiskCfgSettings(); 
    101     QStringList getComponentCfgSettings(); 
    102101 
    103102    void startConfigGen(); // Function which takes pieces of cfg, and assembles 
Note: See TracChangeset for help on using the changeset viewer.