From: Tom Rini <tom_rini@mentor.com>
Date: Mon, 1 Nov 2010 19:27:24 +0000 (-0700)
Subject: stage-manager: Fix removal of installed packages
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0de2221d3b4412cc018dfa3b25cf42f64dba49ea;p=openembedded.git

stage-manager: Fix removal of installed packages

Currently, the status line for installed pstaging packages will ready
'Status: install user installed' but we check for 'install ok installed'
so the check fails and we don't remove.  Fix the check to look for user
rather than ok.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---

diff --git a/recipes/stage-manager/files/stage-manager-ipkg b/recipes/stage-manager/files/stage-manager-ipkg
index 53c172e77a..105ea5458a 100755
--- a/recipes/stage-manager/files/stage-manager-ipkg
+++ b/recipes/stage-manager/files/stage-manager-ipkg
@@ -431,7 +431,7 @@ ipkg_status_matching() {
 ipkg_status_installed_sd() {
 	local sd="$1"
 	local pkg="$2"
-	ipkg_status_sd $sd $pkg Status | grep -q "Status: install ok installed"
+	ipkg_status_sd $sd $pkg Status | grep -q "Status: install user installed"
 }
 
 ipkg_status_installed_all() {
diff --git a/recipes/stage-manager/stagemanager-native_0.0.1.bb b/recipes/stage-manager/stagemanager-native_0.0.1.bb
index b54c38df02..957774911c 100644
--- a/recipes/stage-manager/stagemanager-native_0.0.1.bb
+++ b/recipes/stage-manager/stagemanager-native_0.0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Helper script for packaged-staging.bbclass"
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "file://stage-manager \
            file://stage-manager-ipkg \