[SM-Commit] GIT changes to master sorcery by Andrew Stitt (ca60efe21b9b0f5d87c22f145c5380b312517bed)

Andrew Stitt scm at mail.sourcemage.org
Sat Nov 25 12:58:35 EST 2006


GIT changes to master sorcery by Andrew Stitt <astitt at sourcemage.org>:

 ChangeLog        |    6 ++++++
 usr/sbin/cleanse |   11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit ca60efe21b9b0f5d87c22f145c5380b312517bed
Author: Andrew Stitt <astitt at sourcemage.org>
Commit: Andrew Stitt <astitt at sourcemage.org>

    fix bug 13250

commit 43ede0f2c487217f17a482e5e2181454e2b5cd2a
Author: Andrew Stitt <astitt at sourcemage.org>
Commit: Andrew Stitt <astitt at sourcemage.org>

    fix bug 13246

diff --git a/ChangeLog b/ChangeLog
index bb7f333..63b18a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 2006-11-25 Andrew Stitt <astitt at sourcemage.org>
+	* cleanse: add runtime/suggest support to prune, bug 13250
+
+2006-11-25 Andrew Stitt <astitt at sourcemage.org>
+	* cleanse: add runtime/suggest support to delint, bug 13246
+
+2006-11-25 Andrew Stitt <astitt at sourcemage.org>
 	* libinitd: fix bug 12958, improper use of INSTALL_ROOT.
 
 2006-11-25 Andrew Stitt <astitt at sourcemage.org>
diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index 6ba1b5a..959b1e0 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -189,7 +189,7 @@ function delint()
   
   message "Pass one (malformed depends lines)"
   # This grep will pull out malformed lines from the depends file
-  regex='^[^:]*:[^:]*:(on|off):(optional|required):'
+  regex='^[^:]*:[^:]*:(on|off):(optional|required|suggest|required):'
   lines=$(grep -v -E "$regex" $DEPENDS_STATUS)
   if [[ $lines ]] ; then
     message "The following malformed lines were found"
@@ -359,22 +359,27 @@ function prune_depends()
 
     # If the spell is optional, then the dependency can be removed and the spell recast
     # If it's required, then it can't be removed
-    if [[ $3 == required ]] ; then
+    if [[ $3 == required ]] || [[ $3 == runtime ]]; then
       options=( "Ignore" "Dispel $1" "Cast $2" "${options[@]}" )
     elif [[ $3 == optional ]] ; then
       options=( "Ignore" "Dispel $1" "Cast $2" "Recast $1 without $2" "${options[@]}" )
+    elif [[ $3 == suggest ]] ; then
+      options=( "Ignore" "Dispel $1" "Cast $2" "Disable $2 in $1" "${options[@]}" )
     fi
     
     #Get the user's choice of action
     select_list choice "" "${options[@]}" 
     case ${choice} in
       I*)  message "Ignoring."                ;;
-      D*)  echo $1 >> $TMP_DIR/prune.dispel    ;;
+      Dispel*)  echo $1 >> $TMP_DIR/prune.dispel    ;;
       C*)  echo $2 >> $TMP_DIR/prune.cast      ;;
       R*)  echo $1 >> $TMP_DIR/prune.cast
         # Revise choice in the depends file
         sed 's/^\('$1':'$2':\)on\(:optional:.*\)$/\1off\2/' $DEPENDS_STATUS > $TMP_DIR/prune.1
         mv $TMP_DIR/prune.1 $DEPENDS_STATUS
+      Disable*) 
+        sed 's/^\('$1':'$2':\)on\(:suggest:.*\)$/\1off\2/' $DEPENDS_STATUS > $TMP_DIR/prune.1
+        mv $TMP_DIR/prune.1 $DEPENDS_STATUS
         ;;
       S*)  sed 's/^\('$1':\)'$2'\(('$4'):.*\)$/\1'$provider'\2/' $DEPENDS_STATUS > $TMP_DIR/prune.1
         mv $TMP_DIR/prune.1 $DEPENDS_STATUS



More information about the SM-Commit mailing list