From 83734dd6f21a7f4c94abdff1799bfc68702c764a Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 23 Feb 2007 13:29:34 +0000
Subject: moved var/db/world to etc/lbu/packages.list

---
 Makefile |  2 +-
 lbu      | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 3c046de..c6ddc0b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V=0.8_beta2
+V=0.8_beta3
 P=alpine-conf
 PV=$(P)-$(V)
 APKF=$(PV).apk
diff --git a/lbu b/lbu
index 65e2579..c5e2e9b 100644
--- a/lbu
+++ b/lbu
@@ -172,11 +172,19 @@ cmd_commit() {
 
 	cd "$ROOT"
 
-	# for upgrading from packages.list times
-	mkdir -p $(dirname "$INCLUDE_LIST")
-	if ! grep "var/lib/apk/world" "$INCLUDE_LIST" >/dev/null 2>&1 ; then
-		echo "var/lib/apk/world" >> "$INCLUDE_LIST"
-	fi
+#	# for upgrading from packages.list times
+#	mkdir -p $(dirname "$INCLUDE_LIST")
+#	if ! grep "var/lib/apk/world" "$INCLUDE_LIST" >/dev/null 2>&1 ; then
+#		echo "var/lib/apk/world" >> "$INCLUDE_LIST"
+#	fi
+
+	# generate the packages.list
+	echo "#This file is generated by 'lbu commit'" > /etc/lbu/packages.list
+	for i in $(apk_glob '*') ; do
+		reqby=$(apk_info -qr $i);
+		# only add the packages who has no REQUIRED_BY
+		[ -z "$reqby" ] && echo $i
+	done | sed 's/-[0-9].*//' >> /etc/lbu/packages.list
 	
 	# Automatically add list and modified files
 	currentlist=`VERBOSE="" USE_DEFAULT="-a" cmd_status -a | grep -v ^D | awk '{print $2}'`
@@ -206,7 +214,9 @@ cmd_commit() {
 	fi	
 
 	# remove obsolete file
-	if [ -z "$DRYRUN" ] ; then
+	if [ -z "$DRYRUN" ] && [ -f $mnt/packages.list ]; then
+		echo "Note: Removing packages.list from $(basename $mnt)."
+		echo "      /etc/lbu/packages.list will be used."
 		rm -f $mnt/packages.list
 	fi
 
-- 
cgit v1.2.3