# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1225017332 0
# Node ID 59355a393cdab97f692bb27791b446e40d6d69af
# Parent  2cd2f9f2f053bfcf0cbe788640fc4f7390c88610
Add logging

diff -r 2cd2f9f2f053 -r 59355a393cda tazpkg
--- a/tazpkg	Sat Oct 25 10:36:42 2008 +0000
+++ b/tazpkg	Sun Oct 26 10:35:32 2008 +0000
@@ -60,6 +60,7 @@
 BLOCKED=$LOCALSTATE/blocked-packages.list
 DEFAULT_MIRROR="http://mirror.slitaz.org/packages/`cat /etc/slitaz-release`/"
 INSTALL_LIST=""
+LOG=/var/log/tazpkg.log
 
 # Bold red warning for upgrade.
 WARNING="\\033[1;31mWARNING\\033[0;39m"
@@ -237,6 +238,15 @@
 	fi
 }
 
+# Log this activity
+log()
+{
+	[ -e $LOG ] || touch $LOG
+	DATE=`date +'%F %T'`
+	[ -w $LOG ] && 
+	echo "$DATE - $1 - $PACKAGE ($VERSION$EXTRAVERSION)" >> $LOG
+}
+
 # Download a file trying all mirrors
 download()
 {
@@ -362,6 +372,9 @@
 	echo "================================================================================"
 	echo "$PACKAGE ($VERSION$EXTRAVERSION) is installed."
 	echo ""
+	# Log this activity
+	log Installed
+
 }
 
 # Check for loop in deps tree.
@@ -701,14 +714,11 @@
 		# List all installed packages or a specific category.
 		#
 		if [ "$2" = "blocked" ]; then
-			if [ -f $BLOCKED ]; then
-				LIST=`cat $BLOCKED`
-			fi
 			echo ""
 			echo -e "\033[1mBlocked packages\033[0m"
 			echo "================================================================================"
-			if [ -n $LIST ];then
-				echo $LIST
+			if [ -s "$BLOCKED" ];then
+				cat $BLOCKED
 				echo ""
 			else
 				echo -e "No blocked packages found.\n"
@@ -1130,6 +1140,8 @@
 			echo -n "Removing package receipt..."
 			rm -rf $INSTALLED/$PACKAGE
 			status
+			# Log this activity
+			log Removed
 			if [ -n "$ALTERED" ]; then
 				echo -n "Remove packages depending on $PACKAGE"
 				echo -n " (y/N) ? "; read anser
@@ -1670,6 +1682,9 @@
 			echo -n "Add $PACKAGE to : $BLOCKED..."
 			echo $PACKAGE >> $BLOCKED
 			status
+			# Log this activity
+			. $INSTALLED/$PACKAGE/receipt
+			log Blocked
 		fi
 		echo ""
 		;;
@@ -1684,6 +1699,9 @@
 			sed -i s/$PACKAGE/''/ $BLOCKED
 			sed -i '/^$/d' $BLOCKED
 			status
+			# Log this activity
+			. $INSTALLED/$PACKAGE/receipt
+			log Unblocked
 		else
 			echo "$PACKAGE is not in the blocked packages list."
 			echo ""
@@ -1800,6 +1818,8 @@
 			if grep -q ^post_install $INSTALLED/$PACKAGE/receipt; then
 				. $INSTALLED/$PACKAGE/receipt
 				post_install
+				# Log this activity
+				log Reconfigure
 			else 
 				echo -e "\nNothing to do for $PACKAGE."
 			fi
diff -r 2cd2f9f2f053 -r 59355a393cda tazpkgbox
--- a/tazpkgbox	Sat Oct 25 10:36:42 2008 +0000
+++ b/tazpkgbox	Sun Oct 26 10:35:32 2008 +0000
@@ -386,6 +386,15 @@
 			</hbox>
 		</frame>
 		<hbox>
+			<frame Journal>
+				<hbox>
+				<button>
+					<label>Show journal</label>
+					<input file icon="find"></input>
+					<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>
+				</button>
+				</hbox>
+			</frame>
 			<frame Configuration files>
 				<hbox>
 				<button>