[Lunar-commits] r23973 - in lunar/branches/stable: sbin usr/share/man/man8 var/lib/lunar var/lib/lunar/functions

[Auke Kok]

Author: sofar
Date: 2007-04-08 20:52:55 +0200 (Sun, 08 Apr 2007)
New Revision: 23973

Modified:
   lunar/branches/stable/sbin/lrm
   lunar/branches/stable/usr/share/man/man8/lunar.8
   lunar/branches/stable/var/lib/lunar/functions/depends.lunar
   lunar/branches/stable/var/lib/lunar/functions/main.lunar
   lunar/branches/stable/var/lib/lunar/sustained
Log:
Sync with theedge: sustained drops mailx, mqeury fix, man page updates, alias stray message when linning moonbase.


Modified: lunar/branches/stable/sbin/lrm
===================================================================
--- lunar/branches/stable/sbin/lrm	2007-04-08 18:50:28 UTC (rev 23972)
+++ lunar/branches/stable/sbin/lrm	2007-04-08 18:52:55 UTC (rev 23973)
@@ -196,12 +196,14 @@
     verbose_msg "removing module from dependency listing and configs"
     remove_depends $MODULE
     # remove alias if required
+    if [ $MODULE != moonbase ] ; then
     for ALIAS in `cut -d: -f1 $MOONBASE/aliases`; do
       if [ "$(get_local_config `echo LUNAR_ALIAS_${ALIAS:1}`)" == "$MODULE" ]; then
         verbose_msg "removing alias mapping from \"$ALIAS\" to \"$MODULE\""
         unset_local_config `echo LUNAR_ALIAS_${ALIAS:1}`
       fi
     done
+    fi
     # restart xinetd after xinetd.confs have been removed by lrm...
     if [ -n "$SERVICES" -a -n "$XINETD" ] ; then
       verbose_msg "restarting xinetd"

Modified: lunar/branches/stable/usr/share/man/man8/lunar.8
===================================================================
--- lunar/branches/stable/usr/share/man/man8/lunar.8	2007-04-08 18:50:28 UTC (rev 23972)
+++ lunar/branches/stable/usr/share/man/man8/lunar.8	2007-04-08 18:52:55 UTC (rev 23973)
@@ -35,11 +35,11 @@
 .PP
 .I renew
 .IP 
-check installed versions of sources against the moonbase, and recompile where necessary. This is the same as the final stage of a lunar update.
+Update all packages without fetching a fresh moonbase first. Does not run prune or autofix.
 .PP 
 .I update
 .IP 
-automatically updates all installed software packages. This option is non\-interactive and does not start up the menu\-driven interface. It is suitable for use in cron jobs.
+Fetches a new moonbase, updates all packages and runs (optionally) a prune and autofix.
 .PP 
 .I rebuild
 .IP 

Modified: lunar/branches/stable/var/lib/lunar/functions/depends.lunar
===================================================================
--- lunar/branches/stable/var/lib/lunar/functions/depends.lunar	2007-04-08 18:50:28 UTC (rev 23972)
+++ lunar/branches/stable/var/lib/lunar/functions/depends.lunar	2007-04-08 18:52:55 UTC (rev 23973)
@@ -338,6 +338,7 @@
       exit 1
     fi &&
     run_details $1 &&
+    RECONFIGURE= run_configure &&
     RECONFIGURE= run_depends &&
     RECONFIGURE= satisfy_depends
   fi

Modified: lunar/branches/stable/var/lib/lunar/functions/main.lunar
===================================================================
--- lunar/branches/stable/var/lib/lunar/functions/main.lunar	2007-04-08 18:50:28 UTC (rev 23972)
+++ lunar/branches/stable/var/lib/lunar/functions/main.lunar	2007-04-08 18:52:55 UTC (rev 23973)
@@ -274,6 +274,7 @@
   run_conflicts               &&
   satisfy_depends             &&
   show_downloading            &&
+  RECONFIGURE= run_configure  &&
 
   # last minute source code presence check:
   (

Modified: lunar/branches/stable/var/lib/lunar/sustained
===================================================================
--- lunar/branches/stable/var/lib/lunar/sustained	2007-04-08 18:50:28 UTC (rev 23972)
+++ lunar/branches/stable/var/lib/lunar/sustained	2007-04-08 18:52:55 UTC (rev 23973)
@@ -15,7 +15,6 @@
 installwatch
 less
 lunar
-mailx
 make
 modutils
 nano