Changeset 2173f9c5


Ignore:
Timestamp:
07/17/13 09:23:02 (16 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, releng/10.1
Children:
b674606
Parents:
8f0c62d (diff), 4e436f3 (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:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-firstbootgui/firstboot.cpp

    r5bfd1ee r68e9e4c  
    66#include <pcbsd-netif.h> 
    77#include <pcbsd-utils.h> 
     8 
     9#include <sys/types.h> 
     10#include <pwd.h> 
    811 
    912#include "backend.h" 
     
    134137     return; 
    135138  if ( lineUsername->text().isEmpty() ) 
     139     return; 
     140  else if( getpwnam(lineUsername->text().toUtf8()) != NULL ) 
    136141     return; 
    137142  if ( linePW->text().isEmpty() ) 
  • src-qt4/pc-softwaremanager/pbiBackend.cpp

    rc71b68c r4e436f3  
    916916   bool resync = FALSE; 
    917917   if(ID == ProcessManager::UPDATE){ 
     918     //Update the PBIHASH for installed versions 
     919     slotSyncToDatabase(TRUE); 
     920     //Check that the old version is no longer installed 
    918921     if(!isInstalled(cUpdate).isEmpty()){ 
    919922       //Error completing the update - old version still installed 
  • src-sh/pbi-manager/pbi-manager

    r9551e0f r8f0c62d  
    52285228        _omdate="${8}" 
    52295229 
     5230        _uprog="`echo ${_uprog} | tr -d ' '`" 
    52305231        appname="`echo ${_uprog} | tr '[:lower:]' '[:upper:]'`" 
    52315232 
     
    52825283        if [ -n "$_omdate" ] ; then 
    52835284                nDay=`echo $PBI_UPMDATE | cut -d ' ' -f 1` 
    5284                 nHour=`echo $PBI_UPMDATE | cut -d ' ' -f 2` 
    5285                 oDay=`echo $_omdate | cut -d ' ' -f 1` 
    5286                 oHour=`echo $_omdate | cut -d ' ' -f 2` 
    5287  
     5285                nHour=`echo $PBI_UPMDATE | cut -d ' ' -f 2` 
     5286                oDay=`echo $_omdate | cut -d ' ' -f 1` 
     5287                oHour=`echo $_omdate | cut -d ' ' -f 2` 
     5288          
    52885289                # Make sure we have all legit numbers 
    5289                 if [ $(is_num "$nDay") -a $(is_num "$nHour") \ 
    5290                         -a $(is_num "$oDay") -a $(is_num "$oHour") ] ; then 
    5291                         if [ $oDay -gt $nDay ] ; then return 1 ; fi 
    5292                         if [ "$oDay" = "$nDay" -a $oHour -gt $nHour ] ; then return 1 ; fi 
    5293                 fi 
     5290                if [ $(is_num "$nDay") -a $(is_num "$nHour") \ 
     5291                        -a $(is_num "$oDay") -a $(is_num "$oHour") ] ; then 
     5292                        if [ $oDay -gt $nDay ] ; then return 1 ; fi 
     5293                        if [ "$oDay" = "$nDay" -a $oHour -gt $nHour ] ; then return 1 ; fi 
     5294                fi 
    52945295        fi 
    52955296 
Note: See TracChangeset for help on using the changeset viewer.