Changeset b3ebed5


Ignore:
Timestamp:
10/29/13 12:26:40 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
1691c6a
Parents:
9cc1b3c (diff), f233898 (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:
6 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager10/pbi-manager

    r96411aa rf233898  
    61896189                rm "${_od}/build.log.bz2" 
    61906190        fi 
    6191         if [ -e "${_od}/.failed-csum" ] ; then 
    6192                 rm ${_od}/.failed-csum 
    6193         fi 
    61946191 
    61956192        # Move old PBIs to archived folder 
     
    62586255 
    62596256        else 
    6260                 # Save the md5sum of the ports directory 
    6261                 tar cvf - -C "${PORTSDIR}/${_mp}" . 2>/dev/null | md5 -q >${_od}/.failed-csum 
    6262  
    62636257                echo "Failed" > "${_od}/pbi-result" 
    62646258                if [ -n "${PBI_AB_HELPS}" ] ; then 
     
    67416735 
    67426736        #echo "Checking $_port for rebuild in ${PBI_AB_OUTDIR}/$_cd with key of $_bk" 
    6743  
    6744         # Check if this is a failed port we should be skipping until its fixed 
    6745         if [ -e "${PBI_AB_OUTDIR}/${_cd}/.failed-csum" ] ; then 
    6746                 _fcsum="`cat ${PBI_AB_OUTDIR}/${_cd}/.failed-csum`" 
    6747                 _ncsum="`tar cvf - -C "${PORTSDIR}/${_port}" . 2>/dev/null | md5 -q`" 
    6748                 if [ "$_fcsum" = "$_ncsum" ] ; then 
    6749                         #echo "$_port - Skipping failed" 
    6750                         return 1 
    6751                 fi 
    6752         fi       
    67536737 
    67546738        # See if we have an existing PBI 
  • src-sh/pbi-manager10/pbime/pbimount

    rddb13b37 r7234a50  
    4141   is_mounted "${pDir}/virtbase/usr/local" || $NULLFS ${1}/local ${pDir}/virtbase/usr/local 
    4242   is_mounted "${pDir}/virtbase/var/run" || $NULLFS ${pDir}/run ${pDir}/virtbase/var/run 
    43    is_mounted "${pDir}/virtbase/usr/local/etc" || mount -t unionfs -o noatime ${1}/etc ${pDir}/virtbase/usr/local/etc 
    4443   is_mounted "${pDir}/virtbase/compat/linux" || $NULLFS ${1}/linux ${pDir}/virtbase/compat/linux 
    4544   if [ -d "${pDir}/virtbase/usr/local/etc/fonts" ] ; then 
  • src-qt4/PCDM/src/main.cpp

    r5b07f4a r9cc1b3c  
    2626#define TMPLANGFILE QString("/tmp/.PCDMLang") 
    2727#define TMPAUTOLOGINFILE QString("/tmp/.PCDMAutoLogin") 
    28  
     28#define TMPAUTHFILE QString("/tmp/.PCDMAuth") 
    2929//Make sure that prefix is set 
    3030//#ifndef prefix 
  • src-qt4/PCDM/src/pcdm-xprocess.cpp

    re949bab r9cc1b3c  
    407407  } 
    408408} 
     409// ------------------------------------------- 
     410//   XAUTHORITY FUNCTIONS 
     411// ------------------------------------------- 
     412void XProcess::generateXAuth(){ 
     413  //determine the filename 
     414  XAUTHFILENAME = XauFileName(); 
     415  //generate the structure 
     416  XAUTH = new Xauth; 
     417    XAUTH-> 
     418  //open the file (as new) 
     419  FILE *XFILE = fopen( XAUTHFILENAME, "w+" ); 
     420  //Write the authorization file 
     421  XauWriteAuth( XFILE, XAUTH ); 
     422  //Now close the file 
     423  fclose(XFILE); 
     424} 
     425 
     426void XProcess::revokeXAuth(){ 
     427 
     428} 
  • src-qt4/PCDM/src/pcdm-xprocess.h

    r577dd9b r9cc1b3c  
    2222 
    2323#include "pcdm-backend.h" 
     24 
     25#include <X11/Xauth.h> 
    2426 
    2527class XProcess : public QProcess 
     
    5557        void pam_logFailure(int); 
    5658        void pam_shutdown(); //cleanly close all the PAM stuff 
     59        // XAuthoriy functions 
     60        Xauth XAUTH; //saved authority structure 
     61        char *XAUTHFILENAME; //file location for the authority file 
     62        void generateXAuth(); 
     63        void revokeXAuth(); 
    5764         
     65   
    5866  private slots: 
    5967        void slotCleanup(int, QProcess::ExitStatus); 
  • src-qt4/pc-softwaremanager/mainUI.cpp

    r4ba4baf r6763bdf  
    276276 
    277277void MainUI::slotPBIStatusUpdate(QString pbiID){ 
     278  //This will do a full update of a particlar PBI entry 
     279  //    and just update/check the icons for all the other PBI's 
    278280  for(int i=0; i<ui->tree_install_apps->topLevelItemCount(); i++){ 
    279281    QString itemID = ui->tree_install_apps->topLevelItem(i)->whatsThis(0); 
     
    289291        slotUpdateSelectedPBI(true);; //only update status 
    290292      } 
    291       return; // Found our match, we can return now 
     293    }else{ 
     294      //Just check/update the icon if necessary 
     295      if(ui->tree_install_apps->topLevelItem(i)->icon(0).isNull()){ 
     296         ui->tree_install_apps->topLevelItem(i)->setIcon(0, QIcon( PBI->PBIInfo(itemID, QStringList() << "icon").join("") )); 
     297      } 
    292298    } 
    293299  } 
Note: See TracChangeset for help on using the changeset viewer.