[Lunar-commits] r14856 - in lunar/branches/stable: etc/lunar sbin

[Auke Kok]

Author: sofar
Date: 2005-05-20 08:36:45 +0000 (Fri, 20 May 2005)
New Revision: 14856

Modified:
   lunar/branches/stable/etc/lunar/config
   lunar/branches/stable/sbin/lin
Log:
bugfix merge: unc->osdn. Also --want version no longer acts for dependencies, and "exiled" modules are not installed when linned.


Modified: lunar/branches/stable/etc/lunar/config
===================================================================
--- lunar/branches/stable/etc/lunar/config	2005-05-20 08:28:40 UTC (rev 14855)
+++ lunar/branches/stable/etc/lunar/config	2005-05-20 08:36:45 UTC (rev 14856)
@@ -50,20 +50,21 @@
 
               ARCHIVE=${ARCHIVE:=on}
               AUTOFIX=${AUTOFIX:=on}
-            AUTOPRUNE=${AUTOPRUNE:=off}
+            AUTOPRUNE=${AUTOPRUNE:=on}
          MAIL_REPORTS=${MAIL_REPORTS:=off}
              PRESERVE=${PRESERVE:=on}
                  REAP=${REAP:=on}
                 ADMIN=${ADMIN:=root}
                 SOUND=${SOUND:=off}
               SUSTAIN=${SUSTAIN:=on}
-         VIEW_REPORTS=${VIEW_REPORTS:=on}
+         VIEW_REPORTS=${VIEW_REPORTS:=off}
                VOYEUR=${VOYEUR:=on}
               GARBAGE=${GARBAGE:=on}
          PROMPT_DELAY=${PROMPT_DELAY:=150}
- 	  GCCWRAPPERS=${GCCWRAPPERS:=on}
+          GCCWRAPPERS=${GCCWRAPPERS:=on}
         PROBE_EXPIRED=${PROBE_EXPIRED:=on}
-        LUNAR_PRIORITY="+10"
+                TMPFS=${TMPFS:=off}
+       LUNAR_PRIORITY="+10"
 
 #total number of sources for a module
            MAX_SOURCES=100
@@ -77,7 +78,7 @@
               KDE_URL=ftp://ftp.kde.org/pub/kde/
             GNOME_URL=ftp://ftp.gnome.org/pub/GNOME/
            KERNEL_URL=ftp://ftp.kernel.org/
-           SFORGE_URL=http://unc.dl.sourceforge.net/sourceforge/
+           SFORGE_URL=http://osdn.dl.sourceforge.net/sourceforge/
           XFREE86_URL=ftp://ftp.xfree86.org/pub/XFree86/
           LRESORT_URL=http://lunar-linux.org/lunar/cache/
 

Modified: lunar/branches/stable/sbin/lin
===================================================================
--- lunar/branches/stable/sbin/lin	2005-05-20 08:28:40 UTC (rev 14855)
+++ lunar/branches/stable/sbin/lin	2005-05-20 08:36:45 UTC (rev 14856)
@@ -125,7 +125,7 @@
       # no strange stuff should happen here anymore
       for MODULE in $MODULES ; do
         if ! module_installed $MODULE || [ ! -n "$PROBE" ] || ( [ -n "$PROBE" ] && [ "$PROBE_EXPIRED" == "on" ] && module_is_expired $MODULE ) ; then
-          if ! module_held $MODULE ; then
+          if ! module_held $MODULE && ! module_exiled $MODULE ; then
             linING="/var/lock/installing.$MODULE"
             verbose_msg "starting lin \"$MODULE\""
             if ! ( SINGLE_MODULE=1 main $MODULE ) ; then
@@ -139,7 +139,7 @@
               fi
             fi
           else
-            verbose_msg "Skipping compile and install for held module \"$MODULE\""
+            verbose_msg "Skipping compile and install for held/exiled module \"$MODULE\""
           fi
         fi
       done
@@ -156,7 +156,7 @@
 
     run_details $MODULE &&
     run_depends $MODULE &&
-    satisfy_depends $MODULE
+    WANT_VERSION= satisfy_depends $MODULE
 
     if [ -z "$DEPS_ONLY" ] ; then
       if ! module_held $MODULE ; then