Changeset d992b48 for BLFS

Timestamp:

08/12/2007 11:11:07 AM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3.x

Children:

97ad140

Parents:

75414f7

Message:

Merged r3452 from trunk.

File:

• BLFS/gen_config.sh (modified) (3 diffs)

BLFS/gen_config.sh

@@ -48 +48 @@
     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
@@ -76 +80 @@
          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}]"
@@ -115 +123 @@
 
     # 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