File _service:gitpkg:0019-Fix-filtering-out-sb2insta... of Package build

Overview Repositories Revisions Requests Users Attributes Meta

File _service:gitpkg:0019-Fix-filtering-out-sb2install-packages-from-package-l.patch of Package build

From 0aed93b66903bd8359a953fae6aeb1a3e2b55715 Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol@infoserver.lv>
Date: Thu, 27 Oct 2016 22:55:50 +0100
Subject: [PATCH] Fix filtering out sb2install packages from package list.

The existing algorithm for filtering out packages in sb2install list
from list of packages to be installed is incorrect and works only if
sb2install list consists of just one package.

Signed-off-by: Oleg Girko <ol@infoserver.lv>
---
 init_buildsystem | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/init_buildsystem b/init_buildsystem
index e9290ce..2789497 100755
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -686,18 +686,6 @@ else
 	ln -s "$SRC" "$BUILD_TARGET/.init_b_cache/rpms/$PKG.${SRCSUF##*.}"
     done < $RPMLIST
 
-    # SB2 installs aren't part of the natural order, filter them out
-    if test -n "$PACKAGES_TO_SB2INSTALL" ; then
-	for SB2PKG in $PACKAGES_TO_SB2INSTALL ; do
-	    for PKG in $PACKAGES_TO_INSTALL ; do
-		if [ "x$PKG" != "x$SB2PKG" ]; then
-		    NEWPACKAGES_TO_INSTALL="$NEWPACKAGES_TO_INSTALL $PKG"
-		fi
-	    done
-	    PACKAGES_TO_INSTALL="$NEWPACKAGES_TO_INSTALL"
-	done
-    fi
-
     PACKAGES_TO_ALL="$PACKAGES_TO_INSTALL"
     PACKAGES_TO_AVAILABLE="$PACKAGES_TO_INSTALL"
 
@@ -709,6 +697,15 @@ else
 	    test "$settest" = "${settest/ $PKG /}" && PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL $PKG"
 	done
     fi
+    # SB2 installs aren't part of the natural order, filter them out
+    if test -n "$PACKAGES_TO_SB2INSTALL" ; then
+        settest=" $PACKAGES_TO_SB2INSTALL "
+	NEWPACKAGES_TO_INSTALL=
+	for PKG in $PACKAGES_TO_INSTALL ; do
+	    test "$settest" = "${settest/ $PKG /}" && NEWPACKAGES_TO_INSTALL="$NEWPACKAGES_TO_INSTALL $PKG"
+	done
+	PACKAGES_TO_INSTALL="$NEWPACKAGES_TO_INSTALL"
+    fi
     # subtract installonly packages from PACKAGES_TO_AVAILABLE
     if test -n "$PACKAGES_TO_INSTALLONLY" ; then
         settest=" $PACKAGES_TO_INSTALLONLY "
-- 
2.14.3

Places

File _service:gitpkg:0019-Fix-filtering-out-sb2install-packages-from-package-l.patch of Package build

Places