r3452 - jhalfs/trunk/BLFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Aug 12 04:09:52 PDT 2007


Author: manuel
Date: 2007-08-12 05:09:51 -0600 (Sun, 12 Aug 2007)
New Revision: 3452

Modified:
   jhalfs/trunk/BLFS/gen_config.sh
Log:
BLFS: Do not include installed packages newer than the book ones.

Modified: jhalfs/trunk/BLFS/gen_config.sh
===================================================================
--- jhalfs/trunk/BLFS/gen_config.sh	2007-08-11 16:17:39 UTC (rev 3451)
+++ jhalfs/trunk/BLFS/gen_config.sh	2007-08-12 11:09:51 UTC (rev 3452)
@@ -47,9 +47,13 @@
   if [ $PKG_DIR = "." ]; then
     SET_COMMENT=y
       # Do not include previously installed packages
-    if [ -n "${PKG_VER}" ] && [ "x${PKG_VER}" = "x${INST_VER}" ]; then
+    if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
       continue
     fi
+      # Do not include installed packages newer than the book ones
+    if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
+      continue
+    fi
       # Set installed version for updated meta-packages
     [ -n "${INST_VER}" ] && INST_STRING="[installed ${INST_VER}]"
 
@@ -75,9 +79,13 @@
          PKG_VER=$(grep "^${PKG_NAME}[[:space:]]" $inFile | cut -f3)
          INST_VER=$(grep "^${PKG_NAME}[[:space:]]" $inFile | cut -f4)
            # Skip installed meta-package components
-         if [ -n "${PKG_VER}" ] && [ "x${PKG_VER}" = "x${INST_VER}" ]; then
+         if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
            continue
          fi
+          # Do not include installed packages newer than the book ones
+        if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
+          continue
+        fi
            # Set installed version for updated meta-packages components
          [ -n "${INST_VER}" ] && INST_STRING="[installed ${INST_VER}]"
 (
@@ -114,9 +122,13 @@
   esac
 
     # Skip installed packages
-  if [ -n "${PKG_VER}" ] && [ "x${PKG_VER}" = "x${INST_VER}" ]; then
+  if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
     continue
   fi
+    # Do not include installed packages newer than the book ones
+  if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
+    continue
+  fi
     # Set installed version for updated packages
   [ -n "${INST_VER}" ] && INST_STRING="[installed ${INST_VER}]"
 




More information about the alfs-log mailing list