Changeset 84f77ef


Ignore:
Timestamp:
07/29/13 11:43:29 (14 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
c684936, 4f9718b
Parents:
a0dfd2d
Message:

Let us exclude meta-pkgs from the install media which are marked "dl-only"

File:
1 edited

Legend:

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

    r261f12e r84f77ef  
    428428  QList<QStringList> metaPkgs; 
    429429  found=false; 
     430  bool onDisk; 
     431  onDisk=true;  
    430432  QString tmp, mName, mDesc, mIcon, mParent, mDesktop, mPkgFileList; 
    431433  QStringList package; 
     
    471473                // Now add this meta-pkg to the string list 
    472474                package.clear(); 
    473                 //qDebug() << "Found Package" << mName << mDesc << mIcon << mParent << mDesktop << "NO" << mPkgFileList; 
    474                 package << mName << mDesc << mIcon << mParent << mDesktop << "NO" << mPkgFileList; 
    475                 metaPkgs.append(package); 
     475 
     476                // If this package is marked "dl-only" we won't show it 
     477                if ( ! QFile::exists("/usr/local/share/pcbsd/metaset/" + pkgset + "/" + mName + "/dl-only" ) ) { 
     478                  //qDebug() << "Found Package" << mName << mDesc << mIcon << mParent << mDesktop << "NO" << mPkgFileList; 
     479                  package << mName << mDesc << mIcon << mParent << mDesktop << "NO" << mPkgFileList; 
     480                  metaPkgs.append(package); 
     481                } 
    476482                found = true; 
    477483                mName=""; mDesc=""; mIcon=""; mParent=""; mDesktop=""; mPkgFileList=""; 
Note: See TracChangeset for help on using the changeset viewer.