[PC-BSD Commits] r8028 - in pcbsd/current/src-sh/pbi-manager: . rc.d

[svn at pcbsd.org]

Author: kris
Date: 2010-11-13 17:06:55 -0800 (Sat, 13 Nov 2010)
New Revision: 8028

Modified:
   pcbsd/current/src-sh/pbi-manager/pbi-manager
   pcbsd/current/src-sh/pbi-manager/rc.d/pbid
Log:

Fix pbid to not complain about pbid_enable not being set, and hide error if pbi-version doesn't exist



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-11-14 01:03:44 UTC (rev 8027)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-11-14 01:06:55 UTC (rev 8028)
@@ -3528,7 +3528,7 @@
 
 	# Move old PBIs to archived folder
 	get_pbi_progversion
-        oldVersion=`cat ${PBI_AB_OUTDIR}/${_cd}/pbi-version`
+        oldVersion=`cat ${PBI_AB_OUTDIR}/${_cd}/pbi-version 2>/dev/null`
 	if [ "$oldVersion" != "$PBI_PROGVERSION" ]; then
 		echo "Archiving old PBIs..."
 		archive_old_pbis "$_od" "$PBI_AB_ARCHIVENUM"

Modified: pcbsd/current/src-sh/pbi-manager/rc.d/pbid
===================================================================
--- pcbsd/current/src-sh/pbi-manager/rc.d/pbid	2010-11-14 01:03:44 UTC (rev 8027)
+++ pcbsd/current/src-sh/pbi-manager/rc.d/pbid	2010-11-14 01:06:55 UTC (rev 8028)
@@ -11,6 +11,8 @@
 
 . /etc/rc.subr
 
+: ${pbid_enable="NO"}
+
 name=pbid
 rcvar=`set_rcvar`
 pidfile="/var/run/${name}.pid"