From a314f45f8d5b2a527e558053b2ffe9a22fa93d15 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Mon, 9 Nov 2009 18:16:13 +0000
Subject: [PATCH] change order to use "keeping" of installed packages also for
 deb's

---
 init_buildsystem | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/init_buildsystem b/init_buildsystem
index b6cffee..b8818f4 100755
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -600,6 +600,17 @@ for PKG in $PACKAGES_TO_INSTALL_FIRST RUN_LDCONFIG $PACKAGES_TO_INSTALL ; do
 
     test -f $BUILD_ROOT/installed-pkg/$PKG && continue
 
+    test -L $BUILD_ROOT/.init_b_cache/rpms/$PKG.rpm || continue
+    if test -f $BUILD_ROOT/.init_b_cache/rpms/$PKG.id -a -f $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG ; then
+        read PKGID < $BUILD_ROOT/.init_b_cache/rpms/$PKG.id
+	read OLDPKGID < $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG
+	if test "$PKGID" = "$OLDPKGID" ; then
+	    echo "keeping ${PKGID%% *}"
+	    echo "$PKGID" > $BUILD_ROOT/installed-pkg/$PKG
+	    continue
+	fi
+    fi
+
     if test $PSUF = deb ; then
 	# debian world, install deb files
 	test -L $BUILD_ROOT/.init_b_cache/rpms/$PKG.deb || continue
@@ -618,18 +629,6 @@ for PKG in $PACKAGES_TO_INSTALL_FIRST RUN_LDCONFIG $PACKAGES_TO_INSTALL ; do
 	continue
     fi
 
-    test -L $BUILD_ROOT/.init_b_cache/rpms/$PKG.rpm || continue
-
-    if test -f $BUILD_ROOT/.init_b_cache/rpms/$PKG.id -a -f $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG ; then
-        read PKGID < $BUILD_ROOT/.init_b_cache/rpms/$PKG.id
-	read OLDPKGID < $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG
-	if test "$PKGID" = "$OLDPKGID" ; then
-	    echo "keeping ${PKGID%% *}"
-	    echo "$PKGID" > $BUILD_ROOT/installed-pkg/$PKG
-	    continue
-	fi
-    fi
-
     PKGID=`rpm -qp --qf "$RPMIDFMT" $RPMCHECKOPTS_HOST $BUILD_ROOT/.init_b_cache/rpms/$PKG.rpm`
 
     if test -f $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG ; then
@@ -659,6 +658,7 @@ for PKG in $PACKAGES_TO_INSTALL_FIRST RUN_LDCONFIG $PACKAGES_TO_INSTALL ; do
 	    test rpm = "$PKG" && chroot $BUILD_ROOT rpm --rebuilddb
 	fi
     fi
+
     export ADDITIONAL_PARAMS=
     if test "$USE_FORCE" = true ; then
         export ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS --force"
-- 
2.7.4