Changeset 370de21


Ignore:
Timestamp:
03/12/14 17:16:38 (5 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.2
Children:
0c2c416, fdf420c
Parents:
c754313 (diff), 3d35d2e (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:
4 edited

Legend:

Unmodified
Added
Removed
  • src-sh/port-files/pkg-install

    r6330d7c r3d35d2e  
    3939 
    4040# Check if we have our warden.conf file 
    41 if [ ! -e "/usr/local/etc/warden.conf" ] ; then 
    42    cp /usr/local/etc/warden.conf.dist /usr/local/etc/warden.conf 
    43    chmod 644 /usr/local/etc/warden.conf 
     41if [ ! -e "${PREFIX}/etc/warden.conf" ] ; then 
     42   cp ${PREFIX}/etc/warden.conf.dist ${PREFIX}/etc/warden.conf 
     43   chmod 644 ${PREFIX}/etc/warden.conf 
    4444fi 
    4545 
  • src-qt4/pc-softwaremanager/mainUI.cpp

    redece96 re6fddc0  
    3333  statusLabel = new QLabel(); 
    3434  ui->statusbar->addWidget(statusLabel); 
     35  updatesAvailable = -1; //app starting value (0 for no updates, 1 for updates available) 
    3536} 
    3637 
     
    261262    cList << ui->tree_install_apps->topLevelItem(i)->whatsThis(0); 
    262263  } 
     264  bool up = false; //to keep track of whether updates are available for any installed apps 
    263265  //Quick finish if no items installed 
    264266  if(installList.isEmpty()){ 
     
    289291          cList.insert(i,installList[i]); //reflect this inclusion into the current list 
    290292        } 
     293        up = up || !PBI->upgradeAvailable(installList[i]).isEmpty(); //will remain "true" if a single item has an update available 
    291294      }else if(todo==1){ 
    292295        //Update current item 
    293296        formatInstalledItemDisplay( ui->tree_install_apps->topLevelItem(i) ); 
     297        up = up || !PBI->upgradeAvailable(installList[i]).isEmpty(); //will remain "true" if a single item has an update available 
    294298      }else{ 
    295299        //Remove current item 
     
    307311  } //end of empty list check 
    308312   
     313  //Check whether the system needs to be notified about a new PBI update availability 
     314  if( (updatesAvailable==0 && up) || (updatesAvailable==1 && !up) ){ 
     315    SystemFlags::setFlag(SystemFlags::PbiUpdate); 
     316  } 
     317  if(up){ updatesAvailable = 1; } 
     318  else{ updatesAvailable = 0; } 
    309319  //Make sure that there is an item selected 
    310320  if(ui->tree_install_apps->topLevelItemCount() > 0 ){ 
  • src-qt4/pc-softwaremanager/mainUI.h

    r7e41a70 re6fddc0  
    2323#include <QDesktopServices> 
    2424#include <QUrl> 
     25 
     26/* LibPCBSD Includes */ 
     27#include <pcbsd-sysFlags.h> 
    2528 
    2629/* Local Includes */ 
     
    118121  PBIBackend *PBI; 
    119122  //INSTALLED TAB 
     123  int updatesAvailable; 
    120124  QMenu *actionMenu, *appBinMenu, *shortcutMenu, *sDeskMenu, *sMenuMenu, *sMimeMenu, *contextActionMenu; 
    121125  QString cDetails; 
  • src-qt4/port-files/pkg-plist

    r1cf25bb rc754313  
    28722872lib/libpcbsd-utils.so.0 
    28732873lib/libpcbsd-utils.so.0.9 
     2874include/pcbsd-sysFlags.h 
    28742875include/pcbsd-DLProcess.h 
    28752876include/pcbsd-hardware.h 
Note: See TracChangeset for help on using the changeset viewer.