[PC-BSD Commits] r7606 - pcbsd/current/src-qt4/pbi-manager
svn at pcbsd.org
svn at pcbsd.org
Mon Sep 20 13:01:38 PDT 2010
Author: kris
Date: 2010-09-20 13:01:38 -0700 (Mon, 20 Sep 2010)
New Revision: 7606
Modified:
pcbsd/current/src-qt4/pbi-manager/pbi-manager
Log:
Redirect some 'ls' errors when checking if we have PBIs to move
Modified: pcbsd/current/src-qt4/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-qt4/pbi-manager/pbi-manager 2010-09-20 19:38:28 UTC (rev 7605)
+++ pcbsd/current/src-qt4/pbi-manager/pbi-manager 2010-09-20 20:01:38 UTC (rev 7606)
@@ -3293,13 +3293,13 @@
echo "pbi_makeport ${_flags} ${_mp}"
if [ ! -d "${_od}" ] ; then mkdir -p "${_od}" ; fi
- oldpbi="`ls ${_od}/*.pbi*`"
+ oldpbi="`ls ${_od}/*.pbi* 2>/dev/null`"
pbi_makeport ${_flags} ${_mp} 2>${_od}/build.log >${_od}/build.log
if [ "$?" = "0" ] ; then
# Check for new PBIs, don't want to remove a rebuild of the same version
- newpbi="`ls ${_od}/*.pbi`"
+ newpbi="`ls ${_od}/*.pbi 2>/dev/null`"
# Deal old PBIs if we need to
if [ "$newpbi" != "$oldpbi" ] ; then
@@ -3358,13 +3358,13 @@
_curPBIdir="$1"
_oldPBIdir="$2"
- _curPBI=`ls ${_curPBIdir}/*.pbi`
+ _curPBI=`ls ${_curPBIdir}/*.pbi 2>/dev/null`
# First remove any old patches
rm ${_curPBIdir}/*.pbp 2>/dev/null
# Build a list of old PBIs we need to make patches from
- _oPBIs=`ls ${oldPBIdir}/*.pbi`
+ _oPBIs=`ls ${oldPBIdir}/*.pbi 2>/dev/null`
for _oPBI in $_oPBIs
do
# Make sure we don't try to make a patch of identical files
@@ -3711,7 +3711,7 @@
# Prune anything beyond the _keepnum
oCount="0"
- oFiles=`ls -t ${_od}/archived/*.pbi`
+ oFiles=`ls -t ${_od}/archived/*.pbi 2>/dev/null`
for oFile in $oFiles
do
if [ -z "$oFile" ] ; then continue ; fi
More information about the Commits
mailing list