[Lunar-commits] <lunar> Module status field backwards compatibility

[Peter de Ridder]

commit c6ea3aa2fc56a3add76c664d6e561e8cbfc4f560
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Sat, 10 Nov 2012 18:23:13 -0800
URL: https://github.com/lunar-linux/lunar/commit/c6ea3aa2fc56a3add76c664d6e561e8cbfc4f560

Module status field backwards compatibility
---
  libs/modules.lunar | +2/-2     
  prog/lvu           | +1/-1     
  2 files changed, 3 insertions(+), 3 deletions(-)

--- a/libs/modules.lunar
+++ b/libs/modules.lunar
@@ -82,7 +82,7 @@ list_moonbase() {
 # purpose  : return a list of installed (or held) modules
 list_installed() {
   debug_msg "list_installed ($@)"
-  sed "s/:[[:digit:]]*:\\([^:]\\++\\)\\?installed\\(+[^:]\\+\\)\\?:.*$//" "$MODULE_STATUS"
+  sed "s/:[[:digit:]]*:\\([^:]\\++\\)\\?\\(installed\\|held\\)\\(+[^:]\\+\\)\\?:.*$//" "$MODULE_STATUS"
 }
 
 
@@ -300,7 +300,7 @@ module_installed()
 {
   debug_msg "module_installed ($@)"
 
-  has_module_state $1 "installed"
+  has_module_state $1 "(installed|held)"
 }
 
 
--- a/prog/lvu
+++ b/prog/lvu
@@ -1260,7 +1260,7 @@ main()  {
 
     installed)
       if [ -z "$2" ] ; then
-        grep -E '[:+]installed[:+]' "$MODULE_STATUS" | view_file
+        grep -E '[:+](installed|held)[:+]' "$MODULE_STATUS" | view_file
       elif [ -n "$(installed_version $2)" ] ; then
         echo "$(installed_version $2)"
       else