alternative approach for BUILD_RPMS compatability

diff --git a/build b/build
index 5986289..f11f26b 100755 (executable)
--- a/build
+++ b/build
@@ -10,7 +10,7 @@
 test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/build
 test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/build-root
 
-export BUILD_ARCH BUILD_ROOT BUILD_DIR
+export BUILD_ARCH BUILD_ROOT BUILD_RPMS BUILD_DIR
 
 ccache=0
 icecream=0
@@ -581,12 +581,8 @@ test -z "$LIST_STATE" -a "$UID" != 0 && {
 }
 
 if [ -z "$RPMLIST" ]; then
-    for i in ${BUILD_RPMS//:/ /}; do
-       repos[${#repos[@]}]='--repository';
-       repos[${#repos[@]}]="$i";
-    done
-    if [ -z "$repos" ]; then
-       repos=("--repository" "/media/dvd/suse")
+    if [ -z "$repos" -a -z "$BUILD_RPMS" ]; then
+       BUILD_RPMS="/media/dvd/suse"
     fi
 else
     repos=()
@@ -782,6 +778,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
        echo "SPECFILE='${SPECFILE//\'/$Q}'" > $BUILD_ROOT/.build/build.data
        echo "BUILD_JOBS='${BUILD_JOBS//\'/$Q}'" >> $BUILD_ROOT/.build/build.data
        echo "BUILD_ARCH='${BUILD_ARCH//\'/$Q}'" >> $BUILD_ROOT/.build/build.data
+       echo "BUILD_RPMS='${BUILD_RPMS//\'/$Q}'" >> $BUILD_ROOT/.build/build.data
        case $BUILD_DIST in
            */*)
                cp $BUILD_DIST $BUILD_ROOT/.build/build.dist

diff --git a/init_buildsystem b/init_buildsystem
index 9b716b0..68e47f5 100755 (executable)
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -70,9 +70,6 @@ while test -n "$1" ; do
 done
 PKGS=("$@")
 
-# for backward compatability
-repos=("${repos[@]}" ${BUILD_RPMS//:/ /})
-
 #
 # needed functions
 #
@@ -199,22 +196,27 @@ DEVLIST
 }
 
 function validate_cache_file {
-    test "${repos[*]}" != "$(cat $CACHE_FILE.id 2>/dev/null)" && rm -f $CACHE_FILE.id
+    local findonly=''
+    test "${repos[*]} ${BUILD_RPMS//:/ /}" != "$(cat $CACHE_FILE.id 2>/dev/null)" && rm -f $CACHE_FILE.id
     test -f $CACHE_FILE || rm -f $CACHE_FILE.id
-    for SRC in "${repos[@]}" ; do
+    for SRC in "${repos[@]}" ${BUILD_RPMS//:/ /}; do
        test -z "$SRC" && SRC=.
        test "$SRC" -nt $CACHE_FILE && rm -f $CACHE_FILE.id
     done
     if ! test -f $CACHE_FILE.id ; then
        test -z "$LIST_STATE" && echo initializing $CACHE_FILE ...
-       for SRC in "${repos[@]}" ; do
+       for SRC in "${repos[@]}" -- ${BUILD_RPMS//:/ /}; do
+           if test "$SRC" = '--' ; then
+               findonly=1
+               continue
+           fi
            test -z "$SRC" && SRC=`pwd`
            if [ ! -e "$SRC" ]; then
                echo "*** $SRC does not exist" >&2
                cleanup_and_exit 1
-           elif [ -e "$SRC"/suse/setup/descr/packages -o -e "$SRC"/suse/setup/descr/packages.gz ]; then
+           elif [ -z "$findonly" -a -e "$SRC"/suse/setup/descr/packages -o -e "$SRC"/suse/setup/descr/packages.gz ]; then
                set -- $BUILD_DIR/createyastdeps "$SRC"
-           elif [ -e "$SRC"/repodata/repomd.xml ]; then
+           elif [ -z "$findonly" -a -e "$SRC"/repodata/repomd.xml ]; then
                set -- $BUILD_DIR/createrepomddeps "$SRC"
            else
                set -- $BUILD_DIR/createrpmdeps "$SRC"
@@ -224,7 +226,7 @@ function validate_cache_file {
        done > $CACHE_FILE.new
 
        mv $CACHE_FILE.new $CACHE_FILE
-       echo "${repos[*]}" > $CACHE_FILE.id
+       echo "${repos[*]} ${BUILD_RPMS//:/ /}" > $CACHE_FILE.id
     fi
 }