changeset 13193:c50e16fa675f

113 nightly should not call "pkg info" Reviewed by: garrett@nexenta.com Approved by: gwr@nexenta.com
author Richard Lowe <richlowe@richlowe.net>
date Fri, 17 Sep 2010 14:59:29 -0400
parents 517dd7bce70e
children 29348a3b0b76
files usr/src/tools/scripts/nightly.sh
diffstat 1 files changed, 0 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/tools/scripts/nightly.sh	Mon Sep 20 22:29:01 2010 +0400
+++ b/usr/src/tools/scripts/nightly.sh	Fri Sep 17 14:59:29 2010 -0400
@@ -57,7 +57,6 @@
 # Get the absolute path of the nightly script that the user invoked.  This
 # may be a relative path, and we need to do this before changing directory.
 nightly_path=`whence $0`
-nightly_ls="`ls -l $nightly_path`"
 
 #
 # Keep track of where we found nightly so we can invoke the matching
@@ -2500,20 +2499,6 @@
 uname -a 2>&1 | tee -a $build_environ_file >> $LOGFILE
 echo | tee -a $build_environ_file >> $LOGFILE
 
-# nightly
-echo "$0 $@" | tee -a $build_environ_file >> $LOGFILE
-if [[ $nightly_path = "/opt/onbld/bin/nightly" ]]; then
-	# We assume that if you have /opt/onbld/bin/nightly, then
-	# you have some form of the onbld package installed. If this
-	# is not true then your nightly is almost definitely out of
-	# date and should not be used.
-	/usr/bin/pkg info \*onbld\* | \
-	    egrep "Name:|Publisher:|Version:|Packaging:|FMRI:"
-else
-	echo "$nightly_ls"
-fi | tee -a $build_environ_file >> $LOGFILE
-echo | tee -a $build_environ_file >> $LOGFILE
-
 # make
 whence $MAKE | tee -a $build_environ_file >> $LOGFILE
 $MAKE -v | tee -a $build_environ_file >> $LOGFILE