?mode=patch&uid=2006092515265132342

Open Patch: 2006092515265132342 (by stf)

+ stf

Queue: More or less important bugfixes

Journal: apply me

Votecheck 'core-strong': Missing 1 qualified vote(s) (clifford, fake, teha)

scripts/functions

Stefan Fiedler:
        fix pkginstalled() for stage 0; the flist files are stored in
        a different location in this stage. 
        Hardly any package will need this, still it's good to always
        return correct results. 
        Note that since stage 0 uses a different root directory than
        all other stages, packages installed in stage 0 are not seen
        by pkginstalled() in later stages (unless installed again).
        AFAIK this is correct behaviour. 

by stf

depends on [2006091320575529756]

Stefan Fiedler:
        fix pkginstalled() for stage 0; the flist files are stored in
        a different location in this stage. 
        Hardly any package will need this, still it's good to always
        return correct results. 
        Note that since stage 0 uses a different root directory than
        all other stages, packages installed in stage 0 are not seen
        by pkginstalled() in later stages (unless installed again).
        AFAIK this is correct behaviour. 

--- scripts/functions   (Revision 14)
+++ scripts/functions   (Revision 15)
@@ -513,9 +513,13 @@
 # installed.
 #
 pkginstalled() {
-       local pattern="$1"; pattern="${pattern//+/\\+}"
+       local pattern="$1" ; pattern="${pattern//+/\\+}"
 
-       ls $root/var/adm/flists | egrep -q "^($pattern)$"
+       if [ $stagelevel = 0 ] ; then
+               ls "$base/build/$ROCKCFG_ID/ROCK/$toolsdir/var/adm/flists"
+       else
+               ls $root/var/adm/flists
+       fi | egrep -q "^($pattern)$"
 }
 
 # Register a window-manager

[Download this patch]