[Lunar-commits] <lunar> Merge pull request #34 from Ratler/symsnotowned

Auke Kok sofar+github at foo-projects.org
Wed Jan 16 22:25:33 CET 2013


commit 5c5b927da2e98dd353ad6916eae59a10201b1297
Author: Auke Kok <sofar+github at foo-projects.org>
Date: Wed, 16 Jan 2013 13:25:33 -0800
URL: https://github.com/lunar-linux/lunar/commit/5c5b927da2e98dd353ad6916eae59a10201b1297

Merge pull request #34 from Ratler/symsnotowned

syms_not_owned() causes symlinks to become alien
---
  libs/build.lunar    | +0/-15    
  libs/tracking.lunar | +1/-8     
  2 files changed

--- a/libs/build.lunar
+++ b/libs/build.lunar
@@ -327,21 +327,6 @@ default_post_build() {
 }
 
 
-syms_not_owned()  {
-  local DEST
-  debug_msg "syms_not_owned ($@)"
-  while read ITEM ; do
-    if [ -h "$ITEM" ] && [ -f "$ITEM" ]; then
-      DEST=$(basename $(ls -la "$ITEM" | cut -d '>' -f2 | cut -c 2- ) )
-      if ! grep -q "$DEST" "$1" ; then
-	    echo -n "$ITEM\|"
-        echo "$ITEM" >> $TMPDIR/$MODULE.rejected.symlinks
-      fi
-    fi
-  done < $1
-}
-
-
 prepare_module_config()  {
   debug_msg "prepare_module_config ($@)"
   if [ ! -e "$MODULE_CONFIG" ] ; then
--- a/libs/tracking.lunar
+++ b/libs/tracking.lunar
@@ -78,14 +78,7 @@ create_install_log() {
   echo "$COMPILE_LOGS/$MODULE-$VERSION.xz"              >> $TMP_INST_LOG
   echo "$MD5SUM_LOGS/$MODULE-$VERSION"                  >> $TMP_INST_LOG
 
-  MISOWNED_SYMLINKS=$(syms_not_owned  $TMP_INST_LOG
-                      echo  -n  "/dev/null")
-
-  if [ "$MISOWNED_SYMLINKS" == "/dev/null" ] ; then
-    install -m644 $TMP_INST_LOG $INST_LOG
-  else
-    grep -v "$MISOWNED_SYMLINKS" "$TMP_INST_LOG" > $INST_LOG
-  fi
+  install -m644 $TMP_INST_LOG $INST_LOG
 
   temp_destroy $TMP_INST_LOG
 }




More information about the Lunar-commits mailing list