[Lunar-commits] r16984 - lunar/trunk/sbin

[Auke Kok]

Author: sofar
Date: 2005-10-17 23:27:12 +0000 (Mon, 17 Oct 2005)
New Revision: 16984

Modified:
   lunar/trunk/sbin/lunar
Log:
Fix lunar hold menu being broken - elangelo should have filed a bugreport first but I'm feeling nice today :^P


Modified: lunar/trunk/sbin/lunar
===================================================================
--- lunar/trunk/sbin/lunar	2005-10-17 23:15:52 UTC (rev 16983)
+++ lunar/trunk/sbin/lunar	2005-10-17 23:27:12 UTC (rev 16984)
@@ -296,7 +296,6 @@
 
 
 hold_pkgs()  {
-   CHECKLIST=`make_hold_checklist`
   HOLD_TITLE="Select modules to hold or unhold"
    HOLD_HELP="[X]=held  [ ]=installed"
 
@@ -307,26 +306,10 @@
                         --checklist            \
                         "$HOLD_HELP"           \
                         0 0 10                 \
-                        $CHECKLIST`
+                        $(make_hold_checklist)`
   then
-    rm  -f  $MODULE_STATUS
-
-    for  LINE  in  `cat  $MODULE_STATUS_BACKUP`;  do
-        MODULE=`echo  "$LINE"  |  cut  -d : -f1`
-         DATE=`echo  "$LINE"  |  cut  -d : -f2`
-       STATUS=`echo  "$LINE"  |  cut  -d : -f3`
-      VERSION=`echo  "$LINE"  |  cut  -d : -f4`
-
-      if    echo  -e  "$OUTLIST"  |  grep  -q  "^$MODULE\$";  then
-        STATUS="held";
-      else
-        STATUS=${STATUS/held/installed}
-      fi
-
-      echo  "$MODULE:$DATE:$STATUS:$VERSION"  >>  $MODULE_STATUS
-    done
-
-    cp  $MODULE_STATUS  $MODULE_STATUS_BACKUP
+    unhold_modules $(cut -d: -f1 < $MODULE_STATUS)
+    hold_modules $OUTLIST
   fi
 
 }