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
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
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"