tazpkg rev 183

Add logging
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Oct 26 10:35:32 2008 +0000 (2008-10-26)
parents 2cd2f9f2f053
children edf0cb9aa14a
files tazpkg tazpkgbox
line diff
     1.1 --- a/tazpkg	Sat Oct 25 10:36:42 2008 +0000
     1.2 +++ b/tazpkg	Sun Oct 26 10:35:32 2008 +0000
     1.3 @@ -60,6 +60,7 @@
     1.4  BLOCKED=$LOCALSTATE/blocked-packages.list
     1.5  DEFAULT_MIRROR="http://mirror.slitaz.org/packages/`cat /etc/slitaz-release`/"
     1.6  INSTALL_LIST=""
     1.7 +LOG=/var/log/tazpkg.log
     1.8  
     1.9  # Bold red warning for upgrade.
    1.10  WARNING="\\033[1;31mWARNING\\033[0;39m"
    1.11 @@ -237,6 +238,15 @@
    1.12  	fi
    1.13  }
    1.14  
    1.15 +# Log this activity
    1.16 +log()
    1.17 +{
    1.18 +	[ -e $LOG ] || touch $LOG
    1.19 +	DATE=`date +'%F %T'`
    1.20 +	[ -w $LOG ] && 
    1.21 +	echo "$DATE - $1 - $PACKAGE ($VERSION$EXTRAVERSION)" >> $LOG
    1.22 +}
    1.23 +
    1.24  # Download a file trying all mirrors
    1.25  download()
    1.26  {
    1.27 @@ -362,6 +372,9 @@
    1.28  	echo "================================================================================"
    1.29  	echo "$PACKAGE ($VERSION$EXTRAVERSION) is installed."
    1.30  	echo ""
    1.31 +	# Log this activity
    1.32 +	log Installed
    1.33 +
    1.34  }
    1.35  
    1.36  # Check for loop in deps tree.
    1.37 @@ -701,14 +714,11 @@
    1.38  		# List all installed packages or a specific category.
    1.39  		#
    1.40  		if [ "$2" = "blocked" ]; then
    1.41 -			if [ -f $BLOCKED ]; then
    1.42 -				LIST=`cat $BLOCKED`
    1.43 -			fi
    1.44  			echo ""
    1.45  			echo -e "\033[1mBlocked packages\033[0m"
    1.46  			echo "================================================================================"
    1.47 -			if [ -n $LIST ];then
    1.48 -				echo $LIST
    1.49 +			if [ -s "$BLOCKED" ];then
    1.50 +				cat $BLOCKED
    1.51  				echo ""
    1.52  			else
    1.53  				echo -e "No blocked packages found.\n"
    1.54 @@ -1130,6 +1140,8 @@
    1.55  			echo -n "Removing package receipt..."
    1.56  			rm -rf $INSTALLED/$PACKAGE
    1.57  			status
    1.58 +			# Log this activity
    1.59 +			log Removed
    1.60  			if [ -n "$ALTERED" ]; then
    1.61  				echo -n "Remove packages depending on $PACKAGE"
    1.62  				echo -n " (y/N) ? "; read anser
    1.63 @@ -1670,6 +1682,9 @@
    1.64  			echo -n "Add $PACKAGE to : $BLOCKED..."
    1.65  			echo $PACKAGE >> $BLOCKED
    1.66  			status
    1.67 +			# Log this activity
    1.68 +			. $INSTALLED/$PACKAGE/receipt
    1.69 +			log Blocked
    1.70  		fi
    1.71  		echo ""
    1.72  		;;
    1.73 @@ -1684,6 +1699,9 @@
    1.74  			sed -i s/$PACKAGE/''/ $BLOCKED
    1.75  			sed -i '/^$/d' $BLOCKED
    1.76  			status
    1.77 +			# Log this activity
    1.78 +			. $INSTALLED/$PACKAGE/receipt
    1.79 +			log Unblocked
    1.80  		else
    1.81  			echo "$PACKAGE is not in the blocked packages list."
    1.82  			echo ""
    1.83 @@ -1800,6 +1818,8 @@
    1.84  			if grep -q ^post_install $INSTALLED/$PACKAGE/receipt; then
    1.85  				. $INSTALLED/$PACKAGE/receipt
    1.86  				post_install
    1.87 +				# Log this activity
    1.88 +				log Reconfigure
    1.89  			else 
    1.90  				echo -e "\nNothing to do for $PACKAGE."
    1.91  			fi
     2.1 --- a/tazpkgbox	Sat Oct 25 10:36:42 2008 +0000
     2.2 +++ b/tazpkgbox	Sun Oct 26 10:35:32 2008 +0000
     2.3 @@ -386,6 +386,15 @@
     2.4  			</hbox>
     2.5  		</frame>
     2.6  		<hbox>
     2.7 +			<frame Journal>
     2.8 +				<hbox>
     2.9 +				<button>
    2.10 +					<label>Show journal</label>
    2.11 +					<input file icon="find"></input>
    2.12 +					<action>xterm -fa MiscFixed -fs 11 -bg gray93 -fg black -T "Tazpkg journal (q to quit)" -geometry 80x25+120+120 -e "ls -l /var/log/tazpkg.log | cat - /var/log/tazpkg.log | less"</action>
    2.13 +				</button>
    2.14 +				</hbox>
    2.15 +			</frame>
    2.16  			<frame Configuration files>
    2.17  				<hbox>
    2.18  				<button>