From 254df61bd800e9ee592b839d5f5aeb7db19b21fc Mon Sep 17 00:00:00 2001
From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
Date: Thu, 23 Sep 2010 19:07:44 -0400
Subject: [PATCH] Fix my previous two fixes. Now one can enter a category
 directory and use sunrise-commit to remove packages whose directories are
 marked as deleted. Successfully tested to work with a Mercurial repository,
 unlike my previous two commits ;-).

---
 sunrise-commit | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sunrise-commit b/sunrise-commit
index c6d0705..8599d1a 100755
--- a/sunrise-commit
+++ b/sunrise-commit
@@ -145,15 +145,16 @@ find_ebuilds() {
 			SC_REMOVED_PACKAGE_LIST=${SC_REMOVED_PACKAGE_LIST:+${SC_REMOVED_PACKAGE_LIST} }${category}${pkg}
 		done
 
-		# Replace with the filtered version
+		SC_ROOT=${category:+../}
+
+		# Replace with the filtered version, placing all atoms
+		# relative to SC_ROOT
 		SC_CHANGE_LIST=
-		for pkg in ${CS_REMOVED_PACKAGE_LIST}; do
-			SC_CHANGE_LIST="${SC_CHANGE_LIST} ${SC_ROOT}${pkg}"
+		for pkg in ${SC_REMOVED_PACKAGE_LIST}; do
+			SC_CHANGE_LIST="${SC_CHANGE_LIST}${SC_CHANGE_LIST:+ }${SC_ROOT}${pkg}"
 		done
 
 		local sdir
-		SC_ROOT=${category:+../}
-
 		for sdir in eclass licenses profiles; do
 			check_for_changes ${SC_ROOT}${sdir} >/dev/null && SC_CHANGE_LIST="${SC_CHANGE_LIST} ${SC_ROOT}${sdir}"
 		done