[Lunar-commits] <lunar> Sync with theedge: sustained drops mailx, mqeury fix, man page updates, alias stray message when linning moonbase.

[Auke Kok]

commit 2b315cf4681842ff5fbbe82ad9cdf228255344fa
Author: Auke Kok <sofar at lunar-linux.org>
Date:   Sun Apr 8 18:52:55 2007 +0000

    Sync with theedge: sustained drops mailx, mqeury fix, man page updates, alias stray message when linning moonbase.
---
 sbin/lrm                              |    2 ++
 usr/share/man/man8/lunar.8            |    4 ++--
 var/lib/lunar/functions/depends.lunar |    1 +
 var/lib/lunar/functions/main.lunar    |    1 +
 var/lib/lunar/sustained               |    1 -
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sbin/lrm b/sbin/lrm
index a0a2c38..6daaa56 100755
--- a/sbin/lrm
+++ b/sbin/lrm
@@ -196,12 +196,14 @@ lrm_module() {
     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"
diff --git a/usr/share/man/man8/lunar.8 b/usr/share/man/man8/lunar.8
index f995ed6..1578623 100644
--- a/usr/share/man/man8/lunar.8
+++ b/usr/share/man/man8/lunar.8
@@ -35,11 +35,11 @@ but not installed.
 .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 
diff --git a/var/lib/lunar/functions/depends.lunar b/var/lib/lunar/functions/depends.lunar
index 1cc886b..692a2a7 100644
--- a/var/lib/lunar/functions/depends.lunar
+++ b/var/lib/lunar/functions/depends.lunar
@@ -338,6 +338,7 @@ build_module_depends() {
       exit 1
     fi &&
     run_details $1 &&
+    RECONFIGURE= run_configure &&
     RECONFIGURE= run_depends &&
     RECONFIGURE= satisfy_depends
   fi
diff --git a/var/lib/lunar/functions/main.lunar b/var/lib/lunar/functions/main.lunar
index 5ff7fde..f6e84c2 100644
--- a/var/lib/lunar/functions/main.lunar
+++ b/var/lib/lunar/functions/main.lunar
@@ -274,6 +274,7 @@ lin_module()  {
   run_conflicts               &&
   satisfy_depends             &&
   show_downloading            &&
+  RECONFIGURE= run_configure  &&
 
   # last minute source code presence check:
   (
diff --git a/var/lib/lunar/sustained b/var/lib/lunar/sustained
index 9f39be3..513b652 100644
--- a/var/lib/lunar/sustained
+++ b/var/lib/lunar/sustained
@@ -15,7 +15,6 @@ gzip
 installwatch
 less
 lunar
-mailx
 make
 modutils
 nano