[oe-commits] Tom Rini : stage-manager: Fix removal of installed packages

git version control git at git.openembedded.org
Mon Nov 1 19:33:12 UTC 2010


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0de2221d3b4412cc018dfa3b25cf42f64dba49ea
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0de2221d3b4412cc018dfa3b25cf42f64dba49ea

Author: Tom Rini <tom_rini at mentor.com>
Date:   Mon Nov  1 12:27:24 2010 -0700

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 at mentor.com>

---

 recipes/stage-manager/files/stage-manager-ipkg     |    2 +-
 recipes/stage-manager/stagemanager-native_0.0.1.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/stage-manager/files/stage-manager-ipkg b/recipes/stage-manager/files/stage-manager-ipkg
index 53c172e..105ea54 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 b54c38d..9577749 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 \





More information about the Openembedded-commits mailing list