Clean up messages printed by rpatch/pop

2 files changed, 8 insertions, 9 deletions

diff --git a/quilt/pop.in b/quilt/pop.in
index 5619106..06b4455 100644
--- a/quilt/pop.in
+++ b/quilt/pop.in
@@ -183,6 +183,13 @@ do
 	fi
 	[ -z "$opt_quiet" ] && echo
 done
+
+if [ -z "$(top_patch)" ]
+then
+	echo "No patches applied"
+else
+	echo "Now at patch $patch"
+fi
 ### Local Variables:
 ### mode: shell-script
 ### End:
diff --git a/scripts/rpatch.in b/scripts/rpatch.in
index 91d01a5..a8b9c8b 100755
--- a/scripts/rpatch.in
+++ b/scripts/rpatch.in
@@ -141,6 +141,7 @@ rpatch()
 		return 0
 	fi
 
+	echo "Removing $patch"
 	trap "" SIGINT
 	if [ -n "$opt_force" ] || \
 	   ( [ -z "$opt_remove" ] && ! files_may_have_changed $patch )
@@ -187,15 +188,6 @@ rpatch()
 		fi
 	fi
 	trap - SIGINT
-	
-	local top=$(top_patch) where
-	if [ -z "$top" ]
-	then
-		where=$"no patch applied"
-	else
-		where=$"now at $top"
-	fi
-	echo $"Removed $patch, $where"
 }
 
 options=`getopt -o fRqvh -- "$@"`